]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
fs/ntfs3: bound copy_lcns dp->page_lcns[] index in analysis pass
authorMichael Bommarito <michael.bommarito@gmail.com>
Fri, 15 May 2026 16:34:05 +0000 (12:34 -0400)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Wed, 3 Jun 2026 14:37:02 +0000 (16:37 +0200)
commit5e7b598660cfa8e5af172cf4c65cffc126333307
tree6a973dc0270446539341c02244ee3e18970e7d4c
parentfc4626bb3656362de8b0ecd56605d47a19ec3518
fs/ntfs3: bound copy_lcns dp->page_lcns[] index in analysis pass

In log_replay()'s analysis pass, after find_dp() returns a
valid DIR_PAGE_ENTRY for the (target_attr, target_vcn) tuple,
the copy_lcns block walks lrh->lcns_follow further entries:

t16 = le16_to_cpu(lrh->lcns_follow);
for (i = 0; i < t16; i++) {
    size_t j = (size_t)(le64_to_cpu(lrh->target_vcn) -
                        le64_to_cpu(dp->vcn));
    dp->page_lcns[j + i] = lrh->page_lcns[i];
}

find_dp() only validates that target_vcn falls within
[dp->vcn, dp->vcn + dp->lcns_follow), i.e., that the FIRST
cluster is covered.  The walk through the further entries is
not bounded against dp->lcns_follow.  For a malformed LRH
where target_vcn = dp->vcn + dp->lcns_follow - 1 and
lrh->lcns_follow > 1, the i > 0 writes overflow the dp's
allocated page_lcns[] array.

Add the missing j + lrh->lcns_follow <= dp->lcns_follow guard.

Reproduced under UML+KASAN on mainline 8d90b09e6741 as a
slab-out-of-bounds write of size 8 from log_replay+0x68d4 on
the mount path.

This is distinct from Pavitra Jha's 2026-05-02 patch
("fs/ntfs3: validate lcns_follow in log_replay conversion",
<20260502154252.164586-1-jhapavitra98@gmail.com>) which
addresses the separate version-0 dirty-page-table conversion
path's memmove(&dp->vcn, ...) call.  The two fixes are
complementary; both should land.

Fixes: b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4-7
Signed-off-by: Michael Bommarito <michael.bommarito@gmail.com>
[almaz.alexandrovich@paragon-software.com: clang-formatted the changes,
fixed conflicts]
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/fslog.c