From d604e6f5d45e5a7c86a0c03828960f91852bccda Mon Sep 17 00:00:00 2001 From: marius Date: Wed, 14 May 2014 15:52:26 +0000 Subject: [PATCH] MFC: r256561 Prevent an unlikely, but real double free issue in gvinum(8). Coverity ID: 1018965 git-svn-id: svn://svn.freebsd.org/base/stable/9@266040 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sbin/gvinum/gvinum.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c index 5f679a92d..f1a93f40d 100644 --- a/sbin/gvinum/gvinum.c +++ b/sbin/gvinum/gvinum.c @@ -421,6 +421,7 @@ create_drive(char *device) const char *errstr; char *drivename, *dname; int drives, i, flags, volumes, subdisks, plexes; + int found = 0; flags = plexes = subdisks = volumes = 0; drives = 1; @@ -448,10 +449,8 @@ create_drive(char *device) errstr = gctl_issue(req); if (errstr != NULL) { warnx("error creating drive: %s", errstr); - gctl_free(req); - return (NULL); + drivename = NULL; } else { - gctl_free(req); /* XXX: This is needed because we have to make sure the drives * are created before we return. */ /* Loop until it's in the config. */ @@ -461,14 +460,18 @@ create_drive(char *device) /* If we got a different name, quit. */ if (dname == NULL) continue; - if (strcmp(dname, drivename)) { - free(dname); - return (drivename); - } + if (strcmp(dname, drivename)) + found = 1; free(dname); dname = NULL; + if (found) + break; usleep(100000); /* Sleep for 0.1s */ } + if (found == 0) { + warnx("error creating drive"); + drivename = NULL; + } } gctl_free(req); return (drivename); -- 2.45.0