mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
fs/ntfs3: validate Dirty Page Table capacity in log_replay copy_lcns
commit57382ec6acupstream. In the analysis pass of $LogFile journal replay, log_replay() copies LCNs from each action log record into an existing Dirty Page Table (DPT) entry without bounding the destination index. A crafted NTFS image with DPT entry lcns_follow=1 and an action log record with lcns_follow=2 produces a kernel slab out-of-bounds write at mount time: BUG: KASAN: slab-out-of-bounds in log_replay+0x654c/0xdb60 Write of size 8 at addr ffff8880095e1040 by task mount Two attacker-controlled fields can drive j+i past the allocated page_lcns[] array: 1. dp->lcns_follow (capacity) can be smaller than lrh->lcns_follow. 2. lrh->target_vcn may be smaller than dp->vcn, making the u64 subtraction wrap to a huge size_t. Validate target VCN delta and per-record LCN count against the DPT entry capacity, bail via the existing out: cleanup label with -EINVAL. This mirrors the bounds-check pattern added in commitb2bc7c44ed("fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot") and commit0ca0485e4b("fs/ntfs3: validate rec->used in journal-replay file record check"). Fixes:b46acd6a6a("fs/ntfs3: Add NTFS journal") Reported-by: Yunpeng Tian <shionthanatos@gmail.com> Reported-by: Mingda Zhang <npczmd@qq.com> Reported-by: Gongming Wang <gmwgg05@gmail.com> Reported-by: Peiyuan Xu <paulbucket12@gmail.com> Reported-by: Qinrun Dai <jupmouse@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Yunpeng Tian <shionthanatos@gmail.com> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
c00164c9e7
commit
cf28fc1658
+15
-5
@@ -4546,11 +4546,21 @@ copy_lcns:
|
||||
* whole routine a loop, case Lcns do not fit below.
|
||||
*/
|
||||
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];
|
||||
}
|
||||
t32 = le32_to_cpu(dp->lcns_follow);
|
||||
if (le64_to_cpu(lrh->target_vcn) < le64_to_cpu(dp->vcn)) {
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < t16; i++) {
|
||||
size_t j = (size_t)(le64_to_cpu(lrh->target_vcn) -
|
||||
le64_to_cpu(dp->vcn));
|
||||
if (j >= t32 || i >= t32 - j) {
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
dp->page_lcns[j + i] = lrh->page_lcns[i];
|
||||
}
|
||||
|
||||
goto next_log_record_analyze;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user