upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-15 10:40:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

eli: Zero pad bytes that arise when certain auth algorithms are used

Browse source 
When authentication is configured, GELI ensures that the amount of data
per sector is a multiple of 16 bytes.  This is done in
eli_metadata_softc().  When the digest size is not a multiple of 16
bytes, this leaves some extra pad bytes at the end of every sector, and
they were not being zeroed before being written to disk.  In particular,
this happens with the HMAC/SHA1, HMAC/RIPEMD160 and HMAC/SHA384 data
authentication algorithms.

This change ensures that they are zeroed before being written to disk.

Reported by:	KMSAN
Reviewed by:	delphij, asomers
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 0fcafe8516)
This commit is contained in:
Mark Johnston 2021-07-15 12:23:04 -04:00
parent 822c62b7db
commit 90ffac35b7
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/geom/eli/g_eli_integrity.c
View file

@ -510,6 +510,17 @@ g_eli_auth_run(struct g_eli_worker *wr, struct bio *bp)
if (bp->bio_cmd == BIO_WRITE)
memset(data + sc->sc_alen + data_secsize, 0,
encr_secsize - sc->sc_alen - data_secsize);
} else if (data_secsize + sc->sc_alen != encr_secsize) {
/*
* If the HMAC size is not a multiple of 128 bits, the
* per-sector data size is rounded down to ensure that
* encryption can be performed without requiring any
* padding. In this case, each sector contains unused
* bytes.
*/
if (bp->bio_cmd == BIO_WRITE)
memset(data + sc->sc_alen + data_secsize, 0,
encr_secsize - sc->sc_alen - data_secsize);
}
if (bp->bio_cmd == BIO_WRITE) {