Evolution-X-Devices/kernel_xiaomi_mt6781
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udf: Verify partition map count

Browse Source 
[ Upstream commit 1a11201668e8635602577dcf06f2e96c591d8819 ]

Verify that number of partition maps isn't insanely high which can lead
to large allocation in udf_sb_alloc_partition_maps(). All partition maps
have to fit in the LVD which is in a single block.

Reported-by: syzbot+478f2c1a6f0f447a46bb@syzkaller.appspotmail.com
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[uli: backport to 4.19]
Reviewed-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba>
Reviewed-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Ulrich Hecht <uli@kernel.org>
This commit is contained in:
Jan Kara
2025-07-11 19:01:20 +02:00
committed by Ulrich Hecht
parent ca3d632524
commit 82892efe8f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/udf/super.c
View File

@@ -1414,7 +1414,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
struct genericPartitionMap *gpm;
uint16_t ident;
struct buffer_head *bh;
unsigned int table_len;
unsigned int table_len, part_map_count;
int ret;
bh = udf_read_tagged(sb, block, block, &ident);
@@ -1431,7 +1431,15 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
goto out_bh;
}
ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
part_map_count = le32_to_cpu(lvd->numPartitionMaps);
if (part_map_count > table_len / sizeof(struct genericPartitionMap1)) {
udf_err(sb, "error loading logical volume descriptor: "
"Too many partition maps (%u > %u)\n", part_map_count,
table_len / (unsigned)sizeof(struct genericPartitionMap1));
ret = -EIO;
goto out_bh;
}
ret = udf_sb_alloc_partition_maps(sb, part_map_count);
if (ret)
goto out_bh;