From: Samuel Moelius <sam.moelius@trailofbits.com>
To: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Samuel Moelius <sam.moelius@trailofbits.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] fat: reject BPB volumes whose data area starts beyond total sectors
Date: Fri, 5 Jun 2026 15:52:15 +0000 [thread overview]
Message-ID: <20260605155216.2126545-1-sam.moelius@trailofbits.com> (raw)
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.
Assisted-by: Codex:gpt-5.5-cyber-preview
Signed-off-by: Samuel Moelius <sam.moelius@trailofbits.com>
---
fs/fat/inode.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 28f78df086ef..168a278cc60c 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -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))
--
2.43.0
next reply other threads:[~2026-06-05 15:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 15:52 Samuel Moelius [this message]
2026-06-10 6:25 ` OGAWA Hirofumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260605155216.2126545-1-sam.moelius@trailofbits.com \
--to=sam.moelius@trailofbits.com \
--cc=hirofumi@mail.parknet.co.jp \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome