diff options
author | ngie <ngie@FreeBSD.org> | 2015-12-17 06:31:55 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-12-17 06:31:55 +0000 |
commit | 5952006acb1f0577732ac15f481976227292807f (patch) | |
tree | d64317f2378504271e80fde52d5081f90fc1cf97 /sbin/geom/class | |
parent | 5baa144ddf2321a8a1f340325c1d996e23754fb8 (diff) | |
download | FreeBSD-src-5952006acb1f0577732ac15f481976227292807f.zip FreeBSD-src-5952006acb1f0577732ac15f481976227292807f.tar.gz |
MFC r292048:
Don't leak rsector/sector in mp_label(..)
Use calloc instead of malloc + memset(.., 0, ..) when allocating sector
Differential Revision: https://reviews.freebsd.org/D4450
Reported by: cppcheck
Reviewed by: mav
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sbin/geom/class')
-rw-r--r-- | sbin/geom/class/multipath/geom_multipath.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sbin/geom/class/multipath/geom_multipath.c b/sbin/geom/class/multipath/geom_multipath.c index cdf35d0..5743911 100644 --- a/sbin/geom/class/multipath/geom_multipath.c +++ b/sbin/geom/class/multipath/geom_multipath.c @@ -221,17 +221,15 @@ mp_label(struct gctl_req *req) /* * Allocate a sector to write as metadata. */ - sector = malloc(secsize); + sector = calloc(1, secsize); if (sector == NULL) { gctl_error(req, "unable to allocate metadata buffer"); return; } - memset(sector, 0, secsize); rsector = malloc(secsize); if (rsector == NULL) { - free(sector); gctl_error(req, "unable to allocate metadata buffer"); - return; + goto done; } /* @@ -246,7 +244,7 @@ mp_label(struct gctl_req *req) error = g_metadata_store(name, sector, secsize); if (error != 0) { gctl_error(req, "cannot store metadata on %s: %s.", name, strerror(error)); - return; + goto done; } /* @@ -274,6 +272,9 @@ mp_label(struct gctl_req *req) name2, name); } } +done: + free(rsector); + free(sector); } |