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

sesutil: fix Coverity CIDs

Browse Source 
* 1411604: file descriptor leak
* 1411586: memory leaks, null dereference on ENOMEM

Reported by:	Coverity Scan
Coverity CIDs:	1411604, 1411586
Reviewed by:	trasz
MFC after:	2 weeks
Sponsored by:	Axcient
Differential Revision:	https://reviews.freebsd.org/D23651
This commit is contained in:
Alan Somers 2020-02-13 15:28:56 +00:00
parent a357466592
commit f05cc0f136
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/sesutil/sesutil.c
View File

@ -570,17 +570,17 @@ fetch_device_details(char *devnames, char **model, char **serial, off_t *size)
{
char ident[DISK_IDENT_SIZE];
struct diocgattr_arg arg;
char *device, *tmp;
char *tmp;
off_t mediasize;
int comma;
int fd;
tmp = strdup(devnames);
comma = (int)strcspn(devnames, ",");
asprintf(&tmp, "/dev/%.*s", comma, devnames);
if (tmp == NULL)
err(1, "strdup");
device = strsep(&tmp, ",");
asprintf(&tmp, "/dev/%s", device);
err(1, "asprintf");
fd = open(tmp, O_RDONLY);
free(tmp);
if (fd < 0) {
/*
* This can happen with a disk so broken it cannot
@ -589,6 +589,7 @@ fetch_device_details(char *devnames, char **model, char **serial, off_t *size)
*model = strdup("?");
*serial = strdup("?");
*size = -1;
close(fd);
return;
}
@ -608,6 +609,7 @@ fetch_device_details(char *devnames, char **model, char **serial, off_t *size)
*size = mediasize;
else
*size = -1;
close(fd);
}
static void