summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>2020-06-04 16:50:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-22 09:05:08 +0200
commit958286418617c31ab7d5ee9528a2ad97f2bc5c3c (patch)
tree4bbc1566b07cba9be3d25cc486dbd4464d69ccde /fs
parent53bb2a6566fb84d2ce3d36ecd42af5cb9c34f14e (diff)
downloadlinux-stable-958286418617c31ab7d5ee9528a2ad97f2bc5c3c.tar.gz
linux-stable-958286418617c31ab7d5ee9528a2ad97f2bc5c3c.tar.bz2
linux-stable-958286418617c31ab7d5ee9528a2ad97f2bc5c3c.zip
fat: don't allow to mount if the FAT length == 0
commit b1b65750b8db67834482f758fc385bfa7560d228 upstream. If FAT length == 0, the image doesn't have any data. And it can be the cause of overlapping the root dir and FAT entries. Also Windows treats it as invalid format. Reported-by: syzbot+6f1624f937d9d6911e2d@syzkaller.appspotmail.com Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Marco Elver <elver@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Link: http://lkml.kernel.org/r/87r1wz8mrd.fsf@mail.parknet.co.jp Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/fat/inode.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 70d37a5fd72c..607e1d124062 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1519,6 +1519,12 @@ static int fat_read_bpb(struct super_block *sb, struct fat_boot_sector *b,
goto out;
}
+ if (bpb->fat_fat_length == 0 && bpb->fat32_length == 0) {
+ if (!silent)
+ fat_msg(sb, KERN_ERR, "bogus number of FAT sectors");
+ goto out;
+ }
+
error = 0;
out: