Linux XFS filesystem development
 help / color / mirror / Atom feed
From: Weiming Shi <bestswngs@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Carlos Maiolino <cem@kernel.org>,
	"Darrick J . Wong" <djwong@kernel.org>,
	Brian Foster <bfoster@redhat.com>,
	Christoph Hellwig <hch@infradead.org>, Xiang Mei <xmei5@asu.edu>,
	Weiming Shi <bestswngs@gmail.com>
Subject: [PATCH v2 0/3] xfs: fix NULL deref in log recovery reorder
Date: Wed,  1 Jul 2026 08:38:30 -0700	[thread overview]
Message-ID: <20260701153833.3155514-2-bestswngs@gmail.com> (raw)

A crafted XFS image can commit a transaction whose only item is a bare
transaction header (ri_cnt == 0, ri_buf == NULL).
xlog_recover_reorder_trans() then runs ITEM_TYPE() on it and dereferences
the NULL ri_buf, faulting the kernel at mount time.

v1 was a single patch that added the check but kept an ASSERT(0) on the
path and duplicated the sort_list splice.  Per Christoph's review, v2
splits it:

  1: drop the existing ASSERT(0) on an unrecognized item type
  2: move the sort_list splice out of the loop (no functional change)
  3: add the check that rejects a committed item with no regions

Patch 3 also notes that, since the log is CRC-checked, this is a crafted
image rather than media corruption.

Tested on xfs-7.2-fixes with KASAN: the unpatched kernel oopses in
xlog_recover_reorder_trans; the patched kernel fails the mount with
-EFSCORRUPTED and no splat.

Weiming Shi (3):
  xfs: drop ASSERT(0) on unrecognized log item type
  xfs: splice unsorted log items back to the transaction after the loop
  xfs: fail recovery on a committed log item with no regions

 fs/xfs/xfs_log_recover.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

-- 
2.43.0


             reply	other threads:[~2026-07-01 15:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-01 15:38 Weiming Shi [this message]
2026-07-01 15:38 ` [PATCH v2 1/3] xfs: drop ASSERT(0) on unrecognized log item type Weiming Shi
2026-07-01 21:41   ` Darrick J. Wong
2026-07-02 10:54   ` Christoph Hellwig
2026-07-01 15:38 ` [PATCH v2 2/3] xfs: splice unsorted log items back to the transaction after the loop Weiming Shi
2026-07-01 21:43   ` Darrick J. Wong
2026-07-02 10:55     ` Christoph Hellwig
2026-07-01 15:38 ` [PATCH v2 3/3] xfs: fail recovery on a committed log item with no regions Weiming Shi
2026-07-01 22:08   ` Darrick J. Wong
2026-07-02 10:56     ` Christoph Hellwig
2026-07-02 15:32       ` Darrick J. Wong
2026-07-02 16:13         ` Weiming Shi

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=20260701153833.3155514-2-bestswngs@gmail.com \
    --to=bestswngs@gmail.com \
    --cc=bfoster@redhat.com \
    --cc=cem@kernel.org \
    --cc=djwong@kernel.org \
    --cc=hch@infradead.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=xmei5@asu.edu \
    /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