Skip to contentSkip to conversation

ntfs3: fix OOB read in ntfs_init_from_boot

PATCH New Pavel Skripkin 1 participant 1 message Jul 13, 2023 NTFS3 filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 [email protected]
---
 fs/ntfs3/super.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/ntfs3/super.c +5 -0
index 1a02072b6b0e..e04e89b7335e 100644
@@ -855,6 +855,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)) {
Signature · 1 line
2.40.1