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

Prevent an unlikely, but real double free issue in gvinum(8).

Browse Source 
Coverity ID: 1018965
This commit is contained in:
Xin LI 2013-10-15 21:04:46 +00:00
parent 876a7cf40c
commit 202038ae05
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=256561
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/gvinum/gvinum.c
View File

@ -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);