From nobody Sat Jul 19 00:41:50 2025 X-Original-To: dev-commits-src-all@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 4bkSXb1py7z622Yk; Sat, 19 Jul 2025 00:41:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkSXb13Dfz3brl; Sat, 19 Jul 2025 00:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752885711; 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=EpmKQnev6qO3OzoTpTeZ4iYUIR384CXVxZyZNei60rs=; b=o/UUvTqNRo3FTufvBC1FultgSVhEB3ciaZGYsPF42WedZ2TUn2hhSC+9sp5byaF4jO0PUD M4Sv8Mc0U3AeCBdXL0R6+eX/bVRzsbQnwNijX9q8Q2ugcrZwHOdXcvtGGQgx9hFhYFsQP3 ZSl81/+MS5c9XE39VZpbrFRhhOW431BxY0ZGdgeGOmBHzTPOaNoNNrt2du3NsyoH4BQv9s Vdc7awqy5gNGH9W1H1u4BjpZkki2Z5c6hXs/801dt3KVBoyOM9IBXAV7Uc2M1zSzaE8mlO Ddf6DGTpJd3eReaWhr3Kl4ammwkRtuxYXKuCvXCdHc0pvEZ8OUu16Wg+3iP1mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752885711; 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=EpmKQnev6qO3OzoTpTeZ4iYUIR384CXVxZyZNei60rs=; b=fAXPh7ZgmFuXjkc30ymzRCDszgMpl6yECdeUTALt7QM33K7oFgSOgefd4UncHnwMN9nXQS WYpAiAQnE+9bTkEKx/gsk1aE657E7W2O6g04G/D0VEh0ExrcHF20xRlKE6uQFuIRtn4am3 HK3ZDus3OJj3ZPmb5m0ZwB+qY6+/KaEaRD1u8sbgu8AfSedCg0XAF07tAOfUkbH2w9/kEE xhK6WUtdhAjVmRQ9LtVyTo66WZCtDoyPk0KFZ6sodCuTemshL34NZ3bzmfMNoXfaVUpYnD aSObXU6tBChGZG5xl5mmdNZfgpdjBpY4beJb1C/GNZnSvLW33MW0sjs5WcERJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752885711; a=rsa-sha256; cv=none; b=jGdvGaJbhudSFc7S0RyXn37xNLL1zOO0Ho0MgR4o/8NFypXaz8JDGKL6k5+b/C/IrVQPtt ixJIVfW9/OueiT7brXSBJW6EJqcRxvDfUikTFERtGDPjHi0JMLTnZVIp0H/iM9bw3+01E0 IRvCiyOiQSnvnATNRkPKgIAdknLajF3VQGz8vpsYOpcqsRy8jSVobmJUM3Spu93dwGUPCk +K/hbMo0/+7Z8FMhU6ZFhoq+1aHOz4PTFlvToNYeCT/AQceRBN29hn0nm5G2duFrZpdXio OxR5qzjq8wUBbU7dKtvbUSSyFHSEsoGEjY9SmFwk8D9TFboCwsjAmmXVXOSTsQ== 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 4bkSXb0f6Hz1495; Sat, 19 Jul 2025 00:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56J0foLh016316; Sat, 19 Jul 2025 00:41:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56J0fopI016314; Sat, 19 Jul 2025 00:41:50 GMT (envelope-from git) Date: Sat, 19 Jul 2025 00:41:50 GMT Message-Id: <202507190041.56J0fopI016314@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: 4be9c6f38e78 - main - clnt_rc.c: Fix the case where a TLS handshake fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4be9c6f38e7859b8c913a75f7d900cd79ef6692a Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4be9c6f38e7859b8c913a75f7d900cd79ef6692a commit 4be9c6f38e7859b8c913a75f7d900cd79ef6692a Author: Rick Macklem AuthorDate: 2025-07-19 00:39:08 +0000 Commit: Rick Macklem CommitDate: 2025-07-19 00:39:08 +0000 clnt_rc.c: Fix the case where a TLS handshake fails When a TLS handshake fails during a NFS-over-TLS mount attempt, the socket was left around because it needed to be dereferenced. The dereference was not happening in clnt_vc_destroy() because ct_closeit was not set to TRUE. This patch moves the code that sets ct_closeit to TRUE up to before the rpctls_connect() call, so that ct_closeit is set to TRUE if it fails and clnt_vc_destroy() will then dereference the socket. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D51084 --- sys/rpc/clnt_rc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c index 9e87af578885..44b63e38a8e6 100644 --- a/sys/rpc/clnt_rc.c +++ b/sys/rpc/clnt_rc.c @@ -198,6 +198,12 @@ clnt_reconnect_connect(CLIENT *cl) newclient = clnt_vc_create(so, (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers, rc->rc_sendsz, rc->rc_recvsz, rc->rc_intr); + /* + * CLSET_FD_CLOSE must be done now, in case rpctls_connect() + * fails just below. + */ + if (newclient != NULL) + CLNT_CONTROL(newclient, CLSET_FD_CLOSE, 0); if (rc->rc_tls && newclient != NULL) { CURVNET_SET(so->so_vnet); stat = rpctls_connect(newclient, rc->rc_tlscertname, so, @@ -236,7 +242,6 @@ clnt_reconnect_connect(CLIENT *cl) goto out; } - CLNT_CONTROL(newclient, CLSET_FD_CLOSE, 0); CLNT_CONTROL(newclient, CLSET_CONNECT, &one); CLNT_CONTROL(newclient, CLSET_TIMEOUT, &rc->rc_timeout); CLNT_CONTROL(newclient, CLSET_RETRY_TIMEOUT, &rc->rc_retry);