From nobody Wed Jan 29 18:55:17 2025 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 4YjrvB5cZBz5lmbP; Wed, 29 Jan 2025 18:55:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yjrv966f2z3C8G; Wed, 29 Jan 2025 18:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176917; 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=jcGzatMaJSlNM70DKNjitjubWHb3A88WYb1upPj5Hcc=; b=atf+yjGhJb0ykASWcnyqctvow5qtIeAtmlKBO3vKExOkCLdM5Ps3Ba+iydAncVpl7qMR+p dtKurSABzHHR6DZETydzSZ6Qd8ZnXWyQbITeOAVcg3UDGvAj0zv6PtV/cU0rFwQlZTtn/q j06sayEz8u72bfq6bvQVPuzO/X6zaOcClJnHXn8H2tqBtoYlJIJctP8hz27UktYJWb1mnK R/tB0+r4gSVbYMcFH9V6X6YQTOVRKdHqGGeZGi1tM741zmzY8ZLiW2mlLLHPgeCCQn0Bcp mgs95ka01IROA9kjN0QH1iiuwOO8O1tWHiW9a5YJIO4iKQdwZ0oGDr9z/lTLJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176917; 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=jcGzatMaJSlNM70DKNjitjubWHb3A88WYb1upPj5Hcc=; b=f+p73a3rhQyRh4Jz/NY/Fd7rJlz0r6e93E5wGszGp/sWlC/lgze5qoc11AB0PBoSsa9GOV 5J8iSNsWA6RLPlP98YMRQfoLxlrOESAMS2mKFGSeUiUouzyK9z1wnrjM8VR4LiGBjcpSXD OHQA7UMpCN9/xKFDzwNjSBYcSBN0CvYU15BJti1kRVZHGBPb7BYRCuRbeR1aHXqzNiWSFW p+2iqnF4P+XqB3jrBa5AXrqhvQsTjXeTAC41lIx6HUGlsaB0V/oY+m7LPK+HcV21X0tLxj +GRj49MiOa5Uh9O00ebt+vDhXo7sSuo6NceU1FenPbwLbWAuW6eWGVayXsgNOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176917; a=rsa-sha256; cv=none; b=i4U44UyWnQKjcj7a1lcPl0cUzN8Mqr8tEZtnsNec4lKh1pOFGU+pB+1FhTmzEiK3x+zUu3 MDoFHm/SrVXf7Ma/10VH9LaHqqip5Ceao+azeXyEz1TPatpUt0YdZzt+jOrErzTPskobE7 UXZ+ElIHlxzHCPiz6c9j05UD0Ok9tnNZG0y/GTJZmt+nJEZNj7B4fGb9Axug/fzUgLRB+m 7b2EncCyLwwZOJdb8cLxquNNU2puW1BZgOYpjE2n8wnQkmvsn8oWq2qdZhVfK9vmLo81tA 6tDxtcsQ27rVkfpUxeaHi4WPyEkbl5931PH0x/xJDmDEqc3LKQhm+aCVg4fYMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yjrv95kPdz1ChM; Wed, 29 Jan 2025 18:55:17 +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 50TItHZO064472; Wed, 29 Jan 2025 18:55:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItHKD064469; Wed, 29 Jan 2025 18:55:17 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:17 GMT Message-Id: <202501291855.50TItHKD064469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4fdb8d1ab316 - releng/14.1 - svc.c: Check for a non-NULL xp_socket 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 4fdb8d1ab316c5b80abc0c566b5d05d605e38b12 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4fdb8d1ab316c5b80abc0c566b5d05d605e38b12 commit 4fdb8d1ab316c5b80abc0c566b5d05d605e38b12 Author: Rick Macklem AuthorDate: 2024-05-28 02:22:04 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:11:29 +0000 svc.c: Check for a non-NULL xp_socket Commit a16ff32f04b5 added support to the kernel RPC to set TCP_USE_DDP. However, for the unusual case of a NFSv4.1/4.2 non-NULL callback, the xp_socket field of SVCXPRT is NULL, since it uses the same socket as the client->server connection. This patch adds the check for this to avoid crashes. This only affects NFSv4.1/4.2 mounts where either pNFS or delegations are in use. Approved by: so Security: FreeBSD-EN-25:01.rpc (cherry picked from commit 6c9170e0afc4ebec81ba88a6370ebf6cb55520ba) (cherry picked from commit 4c136aad80e6da1c9aa99de863642fe64a54f9a8) --- sys/rpc/svc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 6d19a0b1ea7d..1e0e02c23cc1 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -1000,6 +1000,7 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) * enable TLS offload first. */ if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + xprt->xp_socket != NULL && atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { if (xprt->xp_socket->so_proto->pr_protocol == IPPROTO_TCP) {