linux-stable.git, branch v6.18.39

Linux 6.18.39

2026-07-18T14:53:38+00:00

Link: https://lore.kernel.org/r/20260716133044.672218725@linuxfoundation.org
Tested-by: Brett A C Sheffield 
Tested-by: Florian Fainelli 
Tested-by: Peter Schneider 
Tested-by: Miguel Ojeda 
Tested-by: Ron Economos 
Tested-by: Wentao Guan 
Tested-by: Shuah Khan 
Tested-by: Pavel Machek (CIP) 
Link: https://lore.kernel.org/r/20260717101904.922623678@linuxfoundation.org
Tested-by: Brett A C Sheffield 
Tested-by: Florian Fainelli 
Tested-by: Pavel Machek (CIP) 
Tested-by: Peter Schneider 
Tested-by: Mark Brown 
Tested-by: Miguel Ojeda 
Signed-off-by: Greg Kroah-Hartman

xfs: use rtrefcount btree cursor in xchk_xref_is_rt_cow_staging

2026-07-18T14:53:37+00:00

commit ee248157da501f0c02688fb64e5359f2832b0b01 upstream.

LOLLM points out that we pass the wrong btree cursor here.  We want the
rtrefcount btree cursor, not the non-rt one.  This is fairly benign
since it only affects tracing data.

Cc: stable@vger.kernel.org # v6.14
Fixes: 91683bb3f264c0 ("xfs: cross-reference checks with the rt refcount btree")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: write the rg superblock when fixing it

2026-07-18T14:53:37+00:00

commit 9af789fa274bc14b907f811f79fa988a6fc6d4e7 upstream.

The rtgroup superblock fixer should write the rtgroup superblock.
LOLLM noticed this, oops. :/

Cc: stable@vger.kernel.org # v6.13
Fixes: 1433f8f9cead37 ("xfs: repair realtime group superblock")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: fix off-by-one error when calling xchk_xref_has_rt_owner

2026-07-18T14:53:37+00:00

commit 5d72a68f2007ba2a968d6bf47dba3f4620bd182e upstream.

LOLLM noticed an off-by-one error when computing the length of the
rtrmap to cross-check.

Cc: stable@vger.kernel.org # v6.14
Fixes: 037a44d8277adf ("xfs: cross-reference the realtime rmapbt")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: don't zap bmbt forks if they are MAXLEVELS tall

2026-07-18T14:53:37+00:00

commit 59c462b0f5cfa107794228051724b34ae9334168 upstream.

LOLLM noticed a discrepancy between the bmbt level checks in the libxfs
bmbt code vs. the inode repair code.  We do actually allow a bmbt root
that proclaims to have a height of XFS_BM_MAXLEVELS.

Cc: stable@vger.kernel.org # v6.8
Fixes: e744cef2060559 ("xfs: zap broken inode forks")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: fully check the parent handle when it points to the rootdir

2026-07-18T14:53:37+00:00

commit ba150ce63453ccd74bae1404c1dfedbd01ecfd55 upstream.

LOLLM noticed that the directory tree path checking declares the path to
be ok if the inumber in the parent pointer reaches the root directory.
Unfortunately, it neglects to check that the generation is correct.  Fix
that by moving the generation check up.

Cc: stable@vger.kernel.org # v6.10
Fixes: 928b721a11789a ("xfs: teach online scrub to find directory tree structure problems")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: clamp timestamp nanoseconds correctly

2026-07-18T14:53:37+00:00

commit 15e38a9366b31d3d61081ead115f1dff59379e24 upstream.

LOLLM noticed an off-by-one error in the nsec clamping; fix that so that
we never have tv_nsec == 1e9.

Cc: stable@vger.kernel.org # v6.8
Fixes: 2d295fe65776d1 ("xfs: repair inode records")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: handle non-inode owners for rtrmap record checking

2026-07-18T14:53:37+00:00

commit 353a5900bc85234e7df05caac37698042dc26348 upstream.

LOLLM noticed that two helper functions in the rtrmapbt scrub code don't
actually handle non-inode owners correctly -- CoW staging extents and
rgsuperblock extents are not shareable, but they are mergeable.  Fix
these two helpers.

Cc: stable@vger.kernel.org # v6.14
Fixes: 2d9a3e98053e8c ("xfs: allow overlapping rtrmapbt records for shared data extents")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: set xfarray killable sort correctly

2026-07-18T14:53:37+00:00

commit 540ddc626245f12f56326ee0c1601f71ebb41d64 upstream.

LOLLM noticed that we *disable* interruptible sorts when the KILLABLE
flag is set.  This is backwards.  Fix the incorrect logic, and rename
the variable to make the connection more obvious.

Cc: stable@vger.kernel.org # v6.10
Fixes: 271557de7cbfde ("xfs: reduce the rate of cond_resched calls inside scrub")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman

xfs: use the rt version of the cow staging checker

2026-07-18T14:53:37+00:00

commit 881f2eb0fcdea2f46a50fa6a892fe9e3ccf19e01 upstream.

LOLLM also noticed that xchk_rtrmapbt_xref ought to be using the rtdev
version of the "is this a cow extent?" helper function, not the datadev
one.

Cc: stable@vger.kernel.org # v6.14
Fixes: 91683bb3f264c0 ("xfs: cross-reference checks with the rt refcount btree")
Signed-off-by: "Darrick J. Wong" 
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig 
Signed-off-by: Carlos Maiolino 
Signed-off-by: Greg Kroah-Hartman