From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Ethan Tidmore <ethantidmore06@gmail.com>,
"Darrick J. Wong" <djwong@kernel.org>,
"Nirjhar Roy (IBM)" <nirjhar.roy.lists@gmail.com>,
Carlos Maiolino <cem@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.12.y] xfs: Fix error pointer dereference
Date: Mon, 9 Mar 2026 09:49:55 -0400 [thread overview]
Message-ID: <20260309134955.1022573-1-sashal@kernel.org> (raw)
In-Reply-To: <2026030917-lagged-volumes-b38a@gregkh>
From: Ethan Tidmore <ethantidmore06@gmail.com>
[ Upstream commit cddfa648f1ab99e30e91455be19cd5ade26338c2 ]
The function try_lookup_noperm() can return an error pointer and is not
checked for one.
Add checks for error pointer in xrep_adoption_check_dcache() and
xrep_adoption_zap_dcache().
Detected by Smatch:
fs/xfs/scrub/orphanage.c:449 xrep_adoption_check_dcache() error:
'd_child' dereferencing possible ERR_PTR()
fs/xfs/scrub/orphanage.c:485 xrep_adoption_zap_dcache() error:
'd_child' dereferencing possible ERR_PTR()
Fixes: 73597e3e42b4 ("xfs: ensure dentry consistency when the orphanage adopts a file")
Cc: stable@vger.kernel.org # v6.16
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Nirjhar Roy (IBM) <nirjhar.roy.lists@gmail.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
[ adapted try_lookup_noperm() calls to d_hash_and_lookup() ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/xfs/scrub/orphanage.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/scrub/orphanage.c b/fs/xfs/scrub/orphanage.c
index 7148d8362db83..46171f61eda43 100644
--- a/fs/xfs/scrub/orphanage.c
+++ b/fs/xfs/scrub/orphanage.c
@@ -443,6 +443,11 @@ xrep_adoption_check_dcache(
return 0;
d_child = d_hash_and_lookup(d_orphanage, &qname);
+ if (IS_ERR(d_child)) {
+ dput(d_orphanage);
+ return PTR_ERR(d_child);
+ }
+
if (d_child) {
trace_xrep_adoption_check_child(sc->mp, d_child);
@@ -480,7 +485,7 @@ xrep_adoption_zap_dcache(
return;
d_child = d_hash_and_lookup(d_orphanage, &qname);
- while (d_child != NULL) {
+ while (!IS_ERR_OR_NULL(d_child)) {
trace_xrep_adoption_invalidate_child(sc->mp, d_child);
ASSERT(d_is_negative(d_child));
--
2.51.0
next prev parent reply other threads:[~2026-03-09 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-09 10:26 FAILED: patch "[PATCH] xfs: Fix error pointer dereference" failed to apply to 6.12-stable tree gregkh
2026-03-09 13:49 ` Sasha Levin [this message]
2026-03-10 21:06 ` [PATCH 6.12.y] xfs: Fix error pointer dereference Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260309134955.1022573-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=cem@kernel.org \
--cc=djwong@kernel.org \
--cc=ethantidmore06@gmail.com \
--cc=nirjhar.roy.lists@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox