]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
fat: fix fat_ra_init() for data clusters == 0
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Wed, 12 Aug 2020 01:36:01 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2020 17:58:01 +0000 (10:58 -0700)
If data clusters == 0, fat_ra_init() calls the ->ent_blocknr() for the
cluster beyond ->max_clusters.

This checks the limit before initialization to suppress the warning.

Reported-by: syzbot+756199124937b31a9b7e@syzkaller.appspotmail.com
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/87mu462sv4.fsf@mail.parknet.co.jp
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/fat/fatent.c

index bbfe18c07417954b04bf6737e0683d3780f32696..f7e3304b78029f8eb080eb9edccae59588039509 100644 (file)
@@ -657,6 +657,9 @@ static void fat_ra_init(struct super_block *sb, struct fatent_ra *ra,
        unsigned long ra_pages = sb->s_bdi->ra_pages;
        unsigned int reada_blocks;
 
+       if (fatent->entry >= ent_limit)
+               return;
+
        if (ra_pages > sb->s_bdi->io_pages)
                ra_pages = rounddown(ra_pages, sb->s_bdi->io_pages);
        reada_blocks = ra_pages << (PAGE_SHIFT - sb->s_blocksize_bits + 1);