summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ctld
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-11-14 16:18:22 +0000
committertrasz <trasz@FreeBSD.org>2015-11-14 16:18:22 +0000
commit9ecfe4bb8b68775f3e0efc3b8880a80be33924d6 (patch)
treef54dde3953322bd3a90b8201b4829d60599f0155 /usr.sbin/ctld
parente8f533f709e83984407b9fe31c9535b2f60c0672 (diff)
downloadFreeBSD-src-9ecfe4bb8b68775f3e0efc3b8880a80be33924d6.zip
FreeBSD-src-9ecfe4bb8b68775f3e0efc3b8880a80be33924d6.tar.gz
Add missing error checks.
MFC after: 1 month Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin/ctld')
-rw-r--r--usr.sbin/ctld/kernel.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 4b4e3fa..8f1cefb 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -516,13 +516,19 @@ retry_port:
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; ",
OpenPOWER on IntegriCloud