From nobody Mon Nov 03 05:31:43 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 4d0Kvh0Zrxz6GM5h; Mon, 03 Nov 2025 05:31:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Kvg5P55z3SM1; Mon, 03 Nov 2025 05:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147903; 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=6e6cbm2ASIrgNqP+k/myTw2j6a4MQGLL0cOPfFzXs60=; b=IhOQU/DnLWTwZPzAEJ4IKYcTBUzeHv0DUaBAEZXVZ1N35MeoPmIjuL8kXXNY+g1539WajY 9oKOnCI+cCZk9R9ATrfAAFPkDsvs/Ky0fjIIFw1+fsB3QomyDDvfo34hxdBu0DSFigAxyD t9V5m2MQBOappZXx7zAfVijMFS+OlSIVPvuZtCnHdn0AgSPGfQzVf8U6GOS/f3HXY5aM3p fRHRAWKwnUAoN2SoVJVQcWZfgGhZv+e1FQMClqdb08vzUZliXjwVfCixFyJDbyrcEcXChQ OnoZJDyYRnuk68OaDEGa2fl0++joxIMeh90FiJgStJ0Cvj+eLgJ6fvmKQEwkVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762147903; 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=6e6cbm2ASIrgNqP+k/myTw2j6a4MQGLL0cOPfFzXs60=; b=kbL/WWJJHQIJUj99TpCTMvO1MdTIBT6bZnntPV3Z3T4PW3Raxp6mXRjhGPKK1Kzp3XpAcv nA6mFBAyfk8stvwqYrCf/GnriSgnacZO3azu5qewT7NCHM6C3cdvqecuFhcR97JTnaOLJt WT2Rw/JSRoIK3dx/7Vb+EMDgEghlTsBOxo4G0uMhW/MwlyPutE5suI+FnOatptDOv0oE4a ujWaH/m2c4h/1/U18rhujCSQQluHo9HrgePHUTxJsbj4vSYpV78iDmWdtQhDF7AXL/GHjS OlodHALrOkX7xJvg3weESI49FTS9eqrtgKZHRQhjk7x/J6Azrg47LihWG4gq1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762147903; a=rsa-sha256; cv=none; b=sYk7Mo5xL3nq4JWRVxrD6fyXaPCRmS2Z8ZfnA+Ir50nNmgoIHPvkiITg3KRgB4IhwZRVBW 7LXKVzMKzsc16MIN6t2kOI9AIPtIIqX1jbKDyJZpLO+sn42F0CsQrhQqw3GLCmg7YwgDzt fH9xPf7ISf51Us6RCS2YAXeEb/kV2idvP7FKW/+5MVLAAoMCTaCAKweVw02P9R1YufYjMH ItHtIGGp9cJrSbLX9oB3nmjuF/44E46XHedwKLwc3hVYs95wMReQDx3JjoMa+KYqIEhSxD WN9FgN0/jlduAjXOYxJtPsf58dUgkacp9HsZ6EaZ7Lmpxq/8H6RU+Q6v+gl6bA== 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 4d0Kvg4L7hzxvy; Mon, 03 Nov 2025 05:31:43 +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 5A35Vh4G071089; Mon, 3 Nov 2025 05:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A35VhvI071086; Mon, 3 Nov 2025 05:31:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 05:31:43 GMT Message-Id: <202511030531.5A35VhvI071086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 8a873a86059f - stable/15 - unionfs: fix NULL deref on closing an fd passed through SCM_RIGHTS 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8a873a86059f13c829315b7867e188d27e314b51 Auto-Submitted: auto-generated The branch stable/15 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=8a873a86059f13c829315b7867e188d27e314b51 commit 8a873a86059f13c829315b7867e188d27e314b51 Author: Jason A. Harmening AuthorDate: 2025-10-13 20:40:46 +0000 Commit: Jason A. Harmening CommitDate: 2025-11-03 04:32:50 +0000 unionfs: fix NULL deref on closing an fd passed through SCM_RIGHTS If the last reference to an open file is contained in an SCM_RIGHTS message in a UNIX domain socket, and that message is discarded without being read out by the receiver, VOP_CLOSE will ultimately be called with ap->a_td == NULL. Change unionfs_close() to check for this condition instead of blindly passing the thread to unionfs_find_node_status() which will try to dereference it. Also add relevant asserts on the node status lookup paths. PR: 289700 Reported by: asomers Reviewed by: asomers, olce Differential Revision: https://reviews.freebsd.org/D53079 (cherry picked from commit 880d180bb21c764aec6bd5bc8c0a6b07b8c2e199) --- sys/fs/unionfs/union_subr.c | 2 ++ sys/fs/unionfs/union_vnops.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index edcc6716b674..f99d9fe9ca35 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -587,6 +587,7 @@ unionfs_find_node_status(struct unionfs_node *unp, struct thread *td) struct unionfs_node_status *unsp; pid_t pid; + MPASS(td != NULL); pid = td->td_proc->p_pid; ASSERT_VOP_ELOCKED(UNIONFSTOV(unp), __func__); @@ -612,6 +613,7 @@ unionfs_get_node_status(struct unionfs_node *unp, struct thread *td, struct unionfs_node_status *unsp; pid_t pid; + MPASS(td != NULL); pid = td->td_proc->p_pid; KASSERT(NULL != unspp, ("%s: NULL status", __func__)); diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 03130f0ca949..0a91d1d5ed02 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -814,7 +814,7 @@ unionfs_close(struct vop_close_args *ap) unp = VTOUNIONFS(vp); lvp = unp->un_lowervp; uvp = unp->un_uppervp; - unsp = unionfs_find_node_status(unp, td); + unsp = (td != NULL) ? unionfs_find_node_status(unp, td) : NULL; if (unsp == NULL || (unsp->uns_lower_opencnt <= 0 && unsp->uns_upper_opencnt <= 0)) {