diff options
| author | Daejun Park <daejun7.park@samsung.com> | 2026-08-19 15:09:39 +0900 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2026-10-08 11:05:45 -0400 |
| commit | 9f359c031885bb50add7d23c7a5a0e9755b134c9 (patch) | |
| tree | 5707ff096e37d8c07fd46f021c8e04293b2ed85f /scripts/Makefile.thinlto | |
| parent | 26a3ff309c91986dbedb05d0e0f0050ea0aa629c (diff) | |
| download | linux-9f359c031885bb50add7d23c7a5a0e9755b134c9.tar.gz linux-9f359c031885bb50add7d23c7a5a0e9755b134c9.zip | |
jbd2: don't advance j_fc_off before the buffer is recorded
jbd2_fc_get_buf() increments journal->j_fc_off before jbd2_journal_bmap()
and __getblk() have had a chance to fail. When either does, the slot
j_fc_wbuf[fc_off] is never assigned, but j_fc_off already counts it.
ext4 then fails the fast commit and falls back, and the fallback path
reaches jbd2_fc_release_bufs() via ext4_fc_commit ->
jbd2_fc_end_commit_fallback -> __jbd2_fc_end_commit -> ext4_fc_cleanup.
That walks down from j_fc_off - 1 and put_bh()es every slot until it
sees NULL, so it also touches the slot that was never written.
j_fc_wbuf comes from a plain kmalloc() and is never zeroed, so a slot
used for the first time holds uninitialised heap data.
Advance j_fc_off only after the buffer head has been stored. That
restores the invariant that j_fc_off covers exactly the filled slots,
which is what jbd2_fc_release_bufs() relies on: the live buffers of the
current fast commit sit above the NULLs the previous one released, so
stopping at the first NULL is correct.
Reproduced on a KASAN kernel with an ext4 fast_commit filesystem on a
loop device, truncating the backing file under the live mount so that
only the journal's fast-commit region falls past the end of the device.
__getblk() then fails for the first fast-commit block while the rest of
the journal is still addressable, so the journal is not aborted and the
fast commit reaches the fallback path. j_fc_wbuf was poisoned to make
the read of the never-written slot visible:
BUG: KASAN: wild-memory-access in jbd2_fc_release_bufs+0x6b/0xd0
Write of size 4 at addr 5a5a5a5a5a5a5ab2 by task sync/961
jbd2_fc_release_bufs+0x6b/0xd0
ext4_fc_cleanup+0x97/0x830
__jbd2_fc_end_commit+0x37/0xc0
ext4_fc_commit+0x524/0x560
ext4_sync_file+0x3c4/0x4b0
__x64_sys_fsync+0x20/0x30
With this patch the same run leaves j_fc_off at 0 across repeated
__getblk() failures and completes cleanly.
Fixes: ff780b91efe9 ("jbd2: add fast commit machinery")
Cc: stable@kernel.org
Reported-by: Yu Junzhe <junzheyu1@gmail.com>
Closes: https://lore.kernel.org/linux-ext4/7e4b109d-64c3-444f-a5dc-93c2ca4576cc@gmail.com/
Signed-off-by: Daejun Park <daejun7.park@samsung.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20260819060939epcms2p37bb8589b2f8a52a2b14bef38fadcf69d@epcms2p3
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'scripts/Makefile.thinlto')
0 files changed, 0 insertions, 0 deletions
