From owner-svn-src-head@freebsd.org Thu Oct 1 18:56:44 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EA9B4430D99; Thu, 1 Oct 2020 18:56:44 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2MmX5wTRz4Xdl; Thu, 1 Oct 2020 18:56:44 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE8F015A84; Thu, 1 Oct 2020 18:56:44 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 091Iui5P018640; Thu, 1 Oct 2020 18:56:44 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 091IuitP018639; Thu, 1 Oct 2020 18:56:44 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202010011856.091IuitP018639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 1 Oct 2020 18:56:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366337 - head/usr.sbin/ctld X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/usr.sbin/ctld X-SVN-Commit-Revision: 366337 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 18:56:45 -0000 Author: trasz Date: Thu Oct 1 18:56:44 2020 New Revision: 366337 URL: https://svnweb.freebsd.org/changeset/base/366337 Log: 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 Modified: head/usr.sbin/ctld/ctld.c Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Thu Oct 1 18:45:31 2020 (r366336) +++ head/usr.sbin/ctld/ctld.c Thu Oct 1 18:56:44 2020 (r366337) @@ -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);