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

Add missing error checks.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-11-14 16:18:22 +00:00
parent 6bfb8cccc3
commit 05c3dfeedf
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/ctld/kernel.c
View File

@ -516,13 +516,19 @@ conf_new_from_kernel(void)
if (strcmp(port->port_frontend, "ha") == 0)
continue;
free(name);
if (port->pp == 0 && port->vp == 0)
if (port->pp == 0 && port->vp == 0) {
name = checked_strdup(port->port_name);
else if (port->vp == 0)
asprintf(&name, "%s/%d", port->port_name, port->pp);
else
asprintf(&name, "%s/%d/%d", port->port_name, port->pp,
port->vp);
} else if (port->vp == 0) {
retval = asprintf(&name, "%s/%d",
port->port_name, port->pp);
if (retval <= 0)
log_err(1, "asprintf");
} else {
retval = asprintf(&name, "%s/%d/%d",
port->port_name, port->pp, port->vp);
if (retval <= 0)
log_err(1, "asprintf");
}
if (port->cfiscsi_target == NULL) {
log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ",