From: Pavel Skripkin <paskripkin@gmail.com>
Date: Thu, 13 Jul 2023 19:41:46 +0000 (+0300)
Subject: fs/ntfs3: Fix OOB read in ntfs_init_from_boot
X-Git-Tag: v6.6-rc7~33^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34e6552a442f268eefd408e47f4f2d471aa64829;p=thirdparty%2Fkernel%2Flinux.git

fs/ntfs3: Fix OOB read in ntfs_init_from_boot

Syzbot was able to create a device which has the last sector of size
512.

After failing to boot from initial sector, reading from boot info from
offset 511 causes OOB read.

To prevent such reports add sanity check to validate if size of buffer_head
if big enough to hold ntfs3 bootinfo

Fixes: 6a4cd3ea7d77 ("fs/ntfs3: Alternative boot if primary boot is corrupted")
Reported-by: syzbot+53ce40c8c0322c06aea5@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---

diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index cf0a720523f05..5341ed80e2d2a 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -878,6 +878,11 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,
 
 check_boot:
 	err = -EINVAL;
+
+	/* Corrupted image; do not read OOB */
+	if (bh->b_size - sizeof(*boot) < boot_off)
+		goto out;
+
 	boot = (struct NTFS_BOOT *)Add2Ptr(bh->b_data, boot_off);
 
 	if (memcmp(boot->system_id, "NTFS    ", sizeof("NTFS    ") - 1)) {