From ba2548b7bfbd9edfa706bf562349e713e6d8bab0 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Thu, 1 Oct 2020 18:56:44 +0000 Subject: [PATCH] Don't ignore the return value from gethostname(3). It probably cannot happen, but it silences Coverity. Reviewed by: mav MFC after: 2 weeks Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26606 --- usr.sbin/ctld/ctld.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index fc17b74de35d..76f5ffc6c801 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -931,7 +931,7 @@ void isns_register(struct isns *isns, struct isns *oldisns) { struct conf *conf = isns->i_conf; - int s; + int error, s; char hostname[256]; if (TAILQ_EMPTY(&conf->conf_targets) || @@ -943,8 +943,10 @@ isns_register(struct isns *isns, struct isns *oldisns) set_timeout(0, false); return; } - gethostname(hostname, sizeof(hostname)); - + error = gethostname(hostname, sizeof(hostname)); + if (error != 0) + log_err(1, "gethostname"); + if (oldisns == NULL || TAILQ_EMPTY(&oldisns->i_conf->conf_targets)) oldisns = isns; isns_do_deregister(oldisns, s, hostname); @@ -957,7 +959,7 @@ void isns_check(struct isns *isns) { struct conf *conf = isns->i_conf; - int s, res; + int error, s, res; char hostname[256]; if (TAILQ_EMPTY(&conf->conf_targets) || @@ -969,8 +971,10 @@ isns_check(struct isns *isns) set_timeout(0, false); return; } - gethostname(hostname, sizeof(hostname)); - + error = gethostname(hostname, sizeof(hostname)); + if (error != 0) + log_err(1, "gethostname"); + res = isns_do_check(isns, s, hostname); if (res < 0) { isns_do_deregister(isns, s, hostname); @@ -984,7 +988,7 @@ void isns_deregister(struct isns *isns) { struct conf *conf = isns->i_conf; - int s; + int error, s; char hostname[256]; if (TAILQ_EMPTY(&conf->conf_targets) || @@ -994,8 +998,10 @@ isns_deregister(struct isns *isns) s = isns_do_connect(isns); if (s < 0) return; - gethostname(hostname, sizeof(hostname)); - + error = gethostname(hostname, sizeof(hostname)); + if (error != 0) + log_err(1, "gethostname"); + isns_do_deregister(isns, s, hostname); close(s); set_timeout(0, false);