From nobody Wed Dec 28 00:42:51 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 4NhXmr0NVKz1LtFq; Wed, 28 Dec 2022 00:42:52 +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 4NhXmq6h5Gz3GNR; Wed, 28 Dec 2022 00:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672188171; 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=ZxvQQjpy3zqVLh5A4VjsbXZj/jpUtaKoEkGykBvV3PY=; b=UkqQ/x9SGYIAYo89qVfhF1aEsZl40tsR3Kv21HUYsnob1tXoD78reCsIQZl5lgxCJ0uewf ZX1G8R7AskiS9pvGOFZjhaN9zbKAwn4ZhLGZ/sJv47MFncbNLGPLjeMWeQqnQG85f/vQNv St/hEvWvLULTBS1abx7NHqOz+p+VEtTLw6FnB3bHvmvXCIHt2K7Gt6D4Os7timiUF+f6C/ o4ovzf8ef5hTzGiY8IrOmuvnyQYO6oWuqnJ4B9QVnSo9WmzZ7u4qKVpRuWZkD7ytTmGZud nnZecXrPiyFnip0Xa3sbmUBr+BuL7+JD3O7AdRcmVbYC8xydszhgKtAiDnxSUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672188171; 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=ZxvQQjpy3zqVLh5A4VjsbXZj/jpUtaKoEkGykBvV3PY=; b=oL+djYXeLns2gJCHZQoyDQV8UcsPkszeZmwtqqbLvxgGBbunX4Kqe+7y4ym399UOaH4fmC pR2w2E6V1fu6XqxJG8Xrj99wLE4bZXYeqyxmJ0lsTZUthGTwbrlC951yz4xHUuyWI6m9Dr CwsaoH7pyvnwot0KxYVuEoIAIBrf3GyRxJ+CTVRd9yHfNXLpp/ScJhic5a1EdeiTyY5eau WNty6XvyljX10uXbbgGvLwYB6+Ow2hng0q7yW0rya76EV1f90O9xXXUBC4kTuqdammpXgD f5S8PJfZ8Mow7yzV7/HvSUJuRyxdh8qPRj4DCivFXvB2WP7Ka/S7xjop0pm/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672188171; a=rsa-sha256; cv=none; b=eFDOoFlPPMN9YZh4Eo5El+gudT4ENDe4H5AG1Vbd76EnFf8b1R8IBPcfBO1muJkmjXk5pB jFXH+c7xN/eNSfU0QIaLfURO1CXoIiiQcjV+clxmse3wutrTj47dwJp8+bmpl1skZ0d3Po IppepVUw4ap/GYGCrfe9r5wvwVjd0PpNhbkZxybw9MVSsjKrgcISqGlaKObHFHspmna7DB jnDMtwKV1cJD+K2XoUTQp1xML8k41d4dAhX6ZDzToFCnQmGluFfLCW9wT8WDsg5FBiWSsf qygy1gbg9PRCKqzO1p79JLqqCIJcKeFWP3O2PGkF3zvN+do2fBHq7gOpcmnOJA== 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 4NhXmq5kgGzVtZ; Wed, 28 Dec 2022 00:42:51 +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 2BS0gp1C040091; Wed, 28 Dec 2022 00:42:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BS0gplE040090; Wed, 28 Dec 2022 00:42:51 GMT (envelope-from git) Date: Wed, 28 Dec 2022 00:42:51 GMT Message-Id: <202212280042.2BS0gplE040090@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: da838e17366c - stable/13 - rpc.tlsclntd: 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: da838e17366c42c8b1b719be322d2129a4e75d8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=da838e17366c42c8b1b719be322d2129a4e75d8c commit da838e17366c42c8b1b719be322d2129a4e75d8c Author: Rick Macklem AuthorDate: 2022-12-21 23:12:06 +0000 Commit: Rick Macklem CommitDate: 2022-12-28 00:41:31 +0000 rpc.tlsclntd: 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 3fe0cb6695e062b5474ae957bf1856e85ba890bd) --- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c index 841c0b4e3114..caa3b5266e48 100644 --- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c +++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c @@ -285,7 +285,14 @@ main(int argc, char **argv) err(1, "Can't register service for local rpctlscd socket"); } - rpctls_syscall(RPCTLS_SYSC_CLSETPATH, _PATH_RPCTLSCDSOCK); + if (rpctls_syscall(RPCTLS_SYSC_CLSETPATH, _PATH_RPCTLSCDSOCK) < 0) { + if (rpctls_debug_level == 0) { + syslog(LOG_ERR, + "Can't set upcall socket path errno=%d", errno); + exit(1); + } + err(1, "Can't set upcall socket path"); + } rpctls_svc_run();