fat: reject BPB volumes whose data area starts beyond total sectors
PATCH 1/1 fat: reject BPB volumes whose data area starts beyond total sectors
fat_fill_super() subtracts sbi->data_start from the BPB total sector count before computing the number of clusters. A malformed image can declare a total sector count smaller than data_start, causing the subtraction to underflow and the mount code to derive a plausible cluster count from the FAT length instead.
Reject such images before the subtraction. In QEMU, a crafted FAT image with total_sectors=2 and data_start=3 mounted successfully before the fix and reading a file returned bytes stored past the BPB-declared end of the volume. With this change, the same image is rejected during mount.
--- fs/fat/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/fat/inode.c +8 -0
@@ -1738,6 +1738,14 @@ int fat_fill_super(struct super_block *sb, struct fs_context *fc,if (total_sectors ==0 ) total_sectors = bpb.fat_total_sect; +if (total_sectors < sbi->data_start) { +if (!silent) +fat_msg (sb,KERN_ERR , +"data area starts beyond volume (%lu > %u)" , + sbi->data_start, total_sectors); + goto out_invalid; + } + total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;if (!is_fat32 (sbi))
Signature · 1 line
2.43.0
Quoted 6 lines · Samuel Moelius
fat_fill_super()subtractssbi->data_startfrom the BPB total sector count before computing the number of clusters. A malformed image can declare a total sector count smaller thandata_start, causing the subtraction to underflow and the mount code to derive a plausible cluster count from the FAT length instead.
Quoted 8 lines
Reject such images before the subtraction. In QEMU, a crafted FAT image with total_sectors=2 and data_start=3 mounted successfully before the fix and reading a file returned bytes stored past the BPB-declared end of the volume. With this change, the same image is rejected during mount.
Assisted-by Codex:gpt-5.5-cyber-previewSigned-off-by Samuel Moelius <[email protected]>
Quoted 23 lines
--- fs/fat/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)fs/fat/inode.c +8
-0@@ -1738,6 +1738,14 @@ int fat_fill_super(struct super_block *sb, struct fs_context *fc,if (total_sectors ==0 ) total_sectors = bpb.fat_total_sect; +if (total_sectors < sbi->data_start) { +if (!silent) +fat_msg (sb,KERN_ERR , +"data area starts beyond volume (%lu > %u)" , + sbi->data_start, total_sectors); + goto out_invalid; + } + total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;if (!is_fat32 (sbi))
Signature · 1 line
OGAWA Hirofumi <[email protected]>