Skip to content

Commit dd9d3e1

Browse files
paeyzRussell King (Oracle)
authored andcommitted
fs/adfs: validate nzones in adfs_validate_bblk()
Reject ADFS disc records with a zero zone count during boot block validation, before the disc record is used. When nzones is 0, adfs_read_map() passes it to kmalloc_array(0, ...) which returns ZERO_SIZE_PTR, and adfs_map_layout() then writes to dm[-1], causing an out-of-bounds write before the allocated buffer. adfs_validate_dr0() already rejects nzones != 1 for old-format images. Add the equivalent check to adfs_validate_bblk() for new-format images so that a crafted image with nzones == 0 is rejected at probe time. Found by syzkaller. Fixes: f6f14a0 ("fs/adfs: map: move map-specific sb initialisation to map.c") Signed-off-by: Bae Yeonju <iwasbaeyz@gmail.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent 6de23f8 commit dd9d3e1

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

fs/adfs/super.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@ static int adfs_validate_bblk(struct super_block *sb, struct buffer_head *bh,
317317
if (adfs_checkdiscrecord(dr))
318318
return -EILSEQ;
319319

320+
if ((dr->nzones | dr->nzones_high << 8) == 0)
321+
return -EILSEQ;
322+
320323
*drp = dr;
321324
return 0;
322325
}

0 commit comments

Comments
 (0)