public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Mark Tinguely <mark.tinguely@oracle.com>
To: linux-xfs@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH] xfs: fix NULL ptr in xfs_attr_leaf_get
Date: Tue, 30 Dec 2025 13:02:41 -0600	[thread overview]
Message-ID: <17cd5bef-e787-4dc9-9536-112d1e2cda2d@oracle.com> (raw)
In-Reply-To: <20251230190029.32684-1-mark.tinguely@oracle.com>


The error path of xfs_attr_leaf_hasname() can leave a NULL
xfs_buf pointer. xfs_has_attr() checks for the NULL pointer but
the other callers do not.

We tripped over the NULL pointer in xfs_attr_leaf_get() but fix
the other callers too.

Fixes v5.8-rc4-95-g07120f1abdff ("xfs: Add xfs_has_attr and subroutines")
No reproducer.

Cc: stable@vger.kernel.org # v5.19+ with another port for v5.9 - v5.18
Signed-off-by: Mark Tinguely <mark.tinguely@oracle.com>
---
  fs/xfs/libxfs/xfs_attr.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 8c04acd30d48..25e2ecf20d14 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -1266,7 +1266,8 @@ xfs_attr_leaf_removename(
  
  	error = xfs_attr_leaf_hasname(args, &bp);
  	if (error == -ENOATTR) {
-		xfs_trans_brelse(args->trans, bp);
+		if (bp)
+			xfs_trans_brelse(args->trans, bp);
  		if (args->op_flags & XFS_DA_OP_RECOVERY)
  			return 0;
  		return error;
@@ -1305,7 +1306,8 @@ xfs_attr_leaf_get(xfs_da_args_t *args)
  	error = xfs_attr_leaf_hasname(args, &bp);
  
  	if (error == -ENOATTR)  {
-		xfs_trans_brelse(args->trans, bp);
+		if (bp)
+			xfs_trans_brelse(args->trans, bp);
  		return error;
  	} else if (error != -EEXIST)
  		return error;
-- 
2.50.1 (Apple Git-155)


       reply	other threads:[~2025-12-30 19:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20251230190029.32684-1-mark.tinguely@oracle.com>
2025-12-30 19:02 ` Mark Tinguely [this message]
2026-01-06  8:09   ` [PATCH] xfs: fix NULL ptr in xfs_attr_leaf_get Christoph Hellwig
2026-01-06 15:40     ` Darrick J. Wong
2026-01-07  6:01       ` Christoph Hellwig
2026-01-09 16:21         ` Christoph Hellwig

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=17cd5bef-e787-4dc9-9536-112d1e2cda2d@oracle.com \
    --to=mark.tinguely@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --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