d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gconcat: Zero the metadata block before writing

Browse Source 
Ensure that string buffers and pad bytes are zero-filled before writing
gconcat metadata.  Also make sure to zero the full block buffer before
encoding the metadata and writing.

Fix some style bugs in g_concat_write_metadata() while here.

Reported by:	KMSAN
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2021-07-13 17:45:59 -04:00
parent 7f053a44ae
commit 0f09ab89cc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/geom/concat/g_concat.c
View File

@ -865,6 +865,7 @@ g_concat_ctl_create(struct gctl_req *req, struct g_class *mp)
return; return;
} }
bzero(&md, sizeof(md));
strlcpy(md.md_magic, G_CONCAT_MAGIC, sizeof(md.md_magic)); strlcpy(md.md_magic, G_CONCAT_MAGIC, sizeof(md.md_magic));
md.md_version = G_CONCAT_VERSION; md.md_version = G_CONCAT_VERSION;
name = gctl_get_asciiparam(req, "arg0"); name = gctl_get_asciiparam(req, "arg0");
@ -876,7 +877,6 @@ g_concat_ctl_create(struct gctl_req *req, struct g_class *mp)
md.md_id = arc4random(); md.md_id = arc4random();
md.md_no = 0; md.md_no = 0;
md.md_all = *nargs - 1; md.md_all = *nargs - 1;
bzero(md.md_provider, sizeof(md.md_provider));
/* This field is not important here. */ /* This field is not important here. */
md.md_provsize = 0; md.md_provsize = 0;
@ -1017,6 +1017,7 @@ g_concat_write_metadata(struct gctl_req *req, struct g_concat_softc *sc)
u_char *sector; u_char *sector;
int error; int error;
bzero(&md, sizeof(md));
strlcpy(md.md_magic, G_CONCAT_MAGIC, sizeof(md.md_magic)); strlcpy(md.md_magic, G_CONCAT_MAGIC, sizeof(md.md_magic));
md.md_version = G_CONCAT_VERSION; md.md_version = G_CONCAT_VERSION;
strlcpy(md.md_name, sc->sc_name, sizeof(md.md_name)); strlcpy(md.md_name, sc->sc_name, sizeof(md.md_name));
@ -1026,25 +1027,24 @@ g_concat_write_metadata(struct gctl_req *req, struct g_concat_softc *sc)
pp = disk->d_consumer->provider; pp = disk->d_consumer->provider;
md.md_no = no; md.md_no = no;
bzero(md.md_provider, sizeof(md.md_provider)); if (disk->d_hardcoded)
if (disk->d_hardcoded) { strlcpy(md.md_provider, pp->name,
strlcpy(md.md_provider, pp->name, sizeof(md.md_provider)); sizeof(md.md_provider));
}
md.md_provsize = disk->d_consumer->provider->mediasize; md.md_provsize = disk->d_consumer->provider->mediasize;
sector = g_malloc(pp->sectorsize, M_WAITOK); sector = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO);
concat_metadata_encode(&md, sector); concat_metadata_encode(&md, sector);
error = g_access(disk->d_consumer, 0, 1, 0); error = g_access(disk->d_consumer, 0, 1, 0);
if (error == 0) { if (error == 0) {
error = g_write_data(disk->d_consumer, pp->mediasize - pp->sectorsize, error = g_write_data(disk->d_consumer,
sector, pp->sectorsize); pp->mediasize - pp->sectorsize, sector,
pp->sectorsize);
(void)g_access(disk->d_consumer, 0, -1, 0); (void)g_access(disk->d_consumer, 0, -1, 0);
} }
g_free(sector); g_free(sector);
if (error != 0) { if (error != 0)
gctl_error(req, "Cannot store metadata on %s: %d", pp->name, error); gctl_error(req, "Cannot store metadata on %s: %d",
} pp->name, error);
no++; no++;
} }