From nobody Thu Dec 22 17:11:27 2022 X-Original-To: dev-commits-src-main@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 4NdH0J19L3z1H12R; Thu, 22 Dec 2022 17:11:28 +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 4NdH0H6HqBz40bq; Thu, 22 Dec 2022 17:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671729087; 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=oqzQrsQbQ3JCVNJ+dhPBcgcgqTfQ/OwkUj/UkRZ2Sgw=; b=b5mAlLkCZoA3iIyM+saJXYyjspvfZEPhEIatQQRmGc4cfppH/V8eB1XAdkz0OPUSYOqDsi ia9Pihjp9y5wjbR4tPFOB2k5btDBI1Gkx6w/oTCXjs3GbCLwyYSs7LFuyHWsAkZCULoqG/ viQi4K+QPXqTXzHH1LZLu4DxFUjVfolywndNLNs03TNkZuLLz0IsP9kSsniKnwWnabRoBO h6MprRDQri/ty4FrwKP3E4L87/1sCSlCDrQ5bFy/fXoTVlPfR65grSvyyUqcRu8yCibsqQ uYKL83sOOwk9sxK7H42QNDtC9zQQO3YuE329OgxXlLjpFCj5ZMNFEqcd2lrHqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671729087; 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=oqzQrsQbQ3JCVNJ+dhPBcgcgqTfQ/OwkUj/UkRZ2Sgw=; b=d6mBy085qSJFEKqgcrOMnDiOB0Ld9hTFoiqggY3lNp6rHLgWgjESHiKe/7jVZ5BUXCT8E+ G4EKEH2IiwT6NdAv820wO6+fKQtWHDtQ9z1H7WjTE4YZPfcgV1IxDZkkpbXFSfOk6+UcoC gWf/ESmSx0WSqaJ2I5e6cq8VWxdS1/6N178qbc2isf/5h0/MvEwyQWW+IaetNe6eDycM+I 3qp2+QMxXWRkB06nnX5cChRdHbcDH9Jir8RG7aMQaYumqrpkLmB59nae5Vo9sWSR1zfN3o D1tTMqIJdHp3TcU0s8eGLTevoTF1NgD1/2EKeWE4b0gKm+3RWDpAGRnoTs5nmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671729087; a=rsa-sha256; cv=none; b=erZULVGL7/dRwwfsiVKkb5vqqFTEIAKA/yLkCyolFQme1KPU1/kyQRh/sA+kwyWgCO7G7B 8xTZant7q6yJklYI0d+3H/eeQy6J8n3d+3BhlxKI2+7/cAvu+TxeVXxwEDua/OPPBAdAKh c0i4a/OJi12Zovzx5NPrU1tBVunuMEJuY+WsGKfuEtsJ0CUxrc9ItpkLZzdKTlM1hmCN09 pclUGeukINPWtODOReBXzX9rJJHGl/a0/YRdtGDi/bA5rpYm4vIluGhKfRngOunVEXVeP+ wq6k0foNFeHNpZGsgX6quflUIDQz5jLOP4y+g/4vEE86j3qxrbiqWUtr1lp/iA== 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 4NdH0H5NpKz12T5; Thu, 22 Dec 2022 17:11:27 +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 2BMHBRcH007797; Thu, 22 Dec 2022 17:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMHBRBR007796; Thu, 22 Dec 2022 17:11:27 GMT (envelope-from git) Date: Thu, 22 Dec 2022 17:11:27 GMT Message-Id: <202212221711.2BMHBRBR007796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: ab3c59a107c5 - main - rpc.tlsservd: Check for a tls syscall failure. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ab3c59a107c56d4304b6ba2c36116b87a0122b4f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3c59a107c56d4304b6ba2c36116b87a0122b4f commit ab3c59a107c56d4304b6ba2c36116b87a0122b4f Author: Rick Macklem AuthorDate: 2022-12-22 17:10:27 +0000 Commit: Rick Macklem CommitDate: 2022-12-22 17:10:27 +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. MFC after: 1 week --- usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c index 2d520ac8e3d1..376f23c4950c 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -402,7 +402,16 @@ main(int argc, char **argv) rpctls_gothup = false; LIST_INIT(&rpctls_ssllist); - rpctls_syscall(RPCTLS_SYSC_SRVSETPATH, rpctls_sockname[mypos]); + if (rpctls_syscall(RPCTLS_SYSC_SRVSETPATH, rpctls_sockname[mypos]) < 0){ + if (rpctls_debug_level == 0) { + syslog(LOG_ERR, + "Can't set upcall socket path=%s errno=%d", + rpctls_sockname[mypos], errno); + exit(1); + } + err(1, "Can't set upcall socket path=%s", + rpctls_sockname[mypos]); + } rpctls_svc_run();