Skip to contentSkip to conversation

ntfs: add check for mft record size in superblock

PATCH Applied Rustam Kovhaev 2 participants 2 messages Aug 24, 2020 NTFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ntfs: add check for mft record size in superblock

number of bytes allocated for mft record should be equal to the mft record size stored in ntfs superblock
as reported by syzbot, userspace might trigger out-of-bounds read by dereferencing ctx->attr in ntfs_attr_find()

---
 fs/ntfs/inode.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/ntfs/inode.c +6 -0
index 9bb9f0952b18..caf563981532 100644
@@ -1810,6 +1810,12 @@ int ntfs_read_inode_mount(struct inode *vi)
 		brelse(bh);
 	}
 
+	if (le32_to_cpu(m->bytes_allocated) != vol->mft_record_size) {
+		ntfs_error(sb, "Incorrect mft record size %u in superblock, should be %u.",
+				le32_to_cpu(m->bytes_allocated), vol->mft_record_size);
+		goto err_out;
+	}
+
 	/* Apply the mst fixups. */
 	if (post_read_mst_fixup((NTFS_RECORD*)m, vol->mft_record_size)) {
 		/* FIXME: Try to use the $MFTMirr now. */
Signature · 1 line
2.28.0
#1 lore raw

Hi Andrew,

Can you please merge this patch? Thanks a lot in advance!

Rustam, thank you for the updated patch!

Best regards,

Anton

Quoted 35 lines · Rustam Kovhaev

number of bytes allocated for mft record should be equal to the mft record size stored in ntfs superblock
as reported by syzbot, userspace might trigger out-of-bounds read by dereferencing ctx->attr in ntfs_attr_find()

---
fs/ntfs/inode.c | 6 ++++++

1 file changed, 6 insertions(+)
fs/ntfs/inode.c +6 -0
index 9bb9f0952b18..caf563981532 100644
@@ -1810,6 +1810,12 @@ int ntfs_read_inode_mount(struct inode *vi)
 		brelse(bh);
 	}
 
+	if (le32_to_cpu(m->bytes_allocated) != vol->mft_record_size) {
+		ntfs_error(sb, "Incorrect mft record size %u in superblock, should be %u.",
+				le32_to_cpu(m->bytes_allocated), vol->mft_record_size);
+		goto err_out;
+	}
+
 	/* Apply the mst fixups. */
 	if (post_read_mst_fixup((NTFS_RECORD*)m, vol->mft_record_size)) {
 		/* FIXME: Try to use the $MFTMirr now. */
Signature · 1 line
2.28.0
Signature · 3 lines
Anton Altaparmakov <anton at tuxera.com> (replace at with @)
Lead in File System Development, Tuxera Inc., http://www.tuxera.com/
Linux NTFS maintainer