From nobody Thu Dec 29 01:28:59 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nj9lb46Khz2knxH; Thu, 29 Dec 2022 01:28:59 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nj9lb2V53z3wCR; Thu, 29 Dec 2022 01:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672277339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntDFetwMN+zeFFK/wZNTNrTA7aNb281uHywbooDYf7Y=; b=DnWNR9SAZVOvnqYH9nKEI5MVmF/+2W7G9qr5DUrGtggXMLyHwu8JupSJ/5ejnRms6AlFiz U2R+NaUd51dja3DdGlNePFns0Z+MH7i/+9Y/VKDMOa+ds2CtmJp9LJXHYTw0rw+eeL4+iM KTyDOnMNTGo5OW5dEsnk4YZKu1c0Xs4jTojw23H8fC0mDDmIYE5RNB+sn74YcifbNG7yr+ i0/ADpwg6NTOA0YiMVNsBJZWYERrFzgVkWLUjgkrIy92WRPn/yCepKHjU1HFlSSATp+xg7 MM61KMjVdync0Hq7Bgx/AvUBB7t4WB9hEFefOZf/cwQ+JlX/Hhdrt5OwHS7ytA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672277339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntDFetwMN+zeFFK/wZNTNrTA7aNb281uHywbooDYf7Y=; b=KbGphoCQ2zX/N3omEOLd75L5vCArDcAe0/WAL0UFaSa52GAd7xh3wY1WA6apBbPRNtCRQI WSl+nT+UCATT7f9p3M3owDsrrcgBAMxuwygHEyW7e5WNbyIj45nlhcOmSIyoz/onN9jh40 kqFAhDHkjzSBvm6trFHUPitWYdhAxi83OTmcEITjLQ7QV/BQghwlduhVo1ZOGZi1rQVaoW K+xsD9ZWEy22eKqLrAVJnsNLLY3DsxocEN+b7vDcCFvJ0q8kV1bxsJGLH8HPHecszOnkjr aZyKfTJUgipgCqRU2T/943+NywDFlK9q7SNxWprUgNkVO4yYv16NdJd/bzp3Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672277339; a=rsa-sha256; cv=none; b=KOwdmgrTZQ0SshWNsjeWnCQSB8q577hGkYgt4o0hz940F+LXNtf6asrJb1CzMX8u0OuTvf 4kBwfmuoRMSRX8MZIIMBUiGIE3EGnravErQS3E8cgY/3mIIuEQEwIWxKef5ECthQ1ncds1 YcGcrwm01VkH7FA15U90cv9aJzY0VyguMGG+MdQx3niNZ4S0wGDKIB6TNEoqaPIazx3tI5 /+YI4Rp4NXFI4K2XZ7NpO1OHgWf5CVXucEMToW0nwDThZAzOW0Wk2CNp6mdu3zmPRNhbAp UP5kpw/EinpnXilXidK1lwexm3nLESu5sR0fOwX8l7v8+XN1DA9i8PJos6KfBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nj9lb1YGjz191j; Thu, 29 Dec 2022 01:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BT1SxoK071212; Thu, 29 Dec 2022 01:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BT1Sxge071211; Thu, 29 Dec 2022 01:28:59 GMT (envelope-from git) Date: Thu, 29 Dec 2022 01:28:59 GMT Message-Id: <202212290128.2BT1Sxge071211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6e9ab1e63192 - stable/13 - rpc.tlsservd: Check for a tls syscall failure. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e9ab1e63192130c4e2fdd16ac8c190e14a886d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6e9ab1e63192130c4e2fdd16ac8c190e14a886d1 commit 6e9ab1e63192130c4e2fdd16ac8c190e14a886d1 Author: Rick Macklem AuthorDate: 2022-12-22 17:10:27 +0000 Commit: Rick Macklem CommitDate: 2022-12-29 01:27:24 +0000 rpc.tlsservd: Check for a tls syscall failure. Although the tls syscall to set up the upcall should not normally fail, the daemon should check for such a failure. This patch adds a check for that failure. (cherry picked from commit ab3c59a107c56d4304b6ba2c36116b87a0122b4f) --- usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c index 8c364584a76c..ffcb856643b9 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -343,7 +343,14 @@ main(int argc, char **argv) rpctls_gothup = false; LIST_INIT(&rpctls_ssllist); - rpctls_syscall(RPCTLS_SYSC_SRVSETPATH, _PATH_RPCTLSSDSOCK); + if (rpctls_syscall(RPCTLS_SYSC_SRVSETPATH, _PATH_RPCTLSSDSOCK) < 0) { + if (rpctls_debug_level == 0) { + syslog(LOG_ERR, + "Can't set upcall socket errno=%d", errno); + exit(1); + } + err(1, "Can't set upcall socket"); + } rpctls_svc_run();