udf: validate partition reference before freeing blocks
PATCH 1/1 udf: validate partition reference before freeing blocks
UDF long allocation descriptors can carry an on-disk partitionReferenceNum. The truncate/free path passes that value to udf_free_blocks(), which indexes s_partmaps[partition] before checking that partition is smaller than s_partitions.
A crafted writable image with one partition and a long allocation descriptor that references partition 1 can therefore make udf_free_blocks() read past the allocated partition map array when truncating the file.
Validate the partition reference before forming the map pointer. Also compare the checked end block, including the caller-supplied offset, against the partition length; the previous test computed blk but then compared logicalBlockNum + count.
--- fs/udf/balloc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/udf/balloc.c +10 -2
@@ -656,13 +656,21 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode, struct kernel_lb_addr *bloc, uint32_t offset, uint32_t count) { + struct udf_sb_info *sbi = UDF_SB(sb);uint16_t partition = bloc->partitionReferenceNum; -struct udf_part_map *map = &UDF_SB (sb)->s_partmaps[partition]; +struct udf_part_map *map;uint32_t blk; +if (partition >= sbi->s_partitions) { +udf_debug ("Invalid partition reference %u (partitions %u)\n" , + partition, sbi->s_partitions); +return ; + } + + map = &sbi->s_partmaps[partition];if (check_add_overflow (bloc->logicalBlockNum, offset, &blk) ||check_add_overflow (blk, count, &blk) || - bloc->logicalBlockNum + count > map->s_partition_len) { + blk > map->s_partition_len) { udf_debug("Invalid request to free blocks: (%d, %u), off %u, " "len %u, partition len %u\n", partition, bloc->logicalBlockNum, offset, count,
Signature · 1 line
2.54.0
Quoted 10 lines · Kyle Zeng
UDF long allocation descriptors can carry an on-disk partitionReferenceNum. The truncate/free path passes that value to
udf_free_blocks(), which indexes s_partmaps[partition] before checking that partition is smaller thans_partitions.A crafted writable image with one partition and a long allocation descriptor that references partition 1 can therefore make
udf_free_blocks()read past the allocated partition map array when truncating the file.
Quoted 7 lines
Validate the partition reference before forming the map pointer. Also compare the checked end block, including the caller-supplied offset, against the partition length; the previous test computed blk but then compared logicalBlockNum + count.
Assisted-by Codex:gpt-5.5Signed-off-by Kyle Zeng <[email protected]>
The patch looks sane but it would make more sense to check the returned extent has valid partition already in udf_current_aext(). That would be much more robust solution, possibly fixing more sites potentially dealin with invalid extents.
Honza
Quoted 35 lines
--- fs/udf/balloc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)fs/udf/balloc.c +10
-2@@ -656,13 +656,21 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode, struct kernel_lb_addr *bloc, uint32_t offset, uint32_t count) { + struct udf_sb_info *sbi = UDF_SB(sb);uint16_t partition = bloc->partitionReferenceNum; -struct udf_part_map *map = &UDF_SB (sb)->s_partmaps[partition]; +struct udf_part_map *map;uint32_t blk; +if (partition >= sbi->s_partitions) { +udf_debug ("Invalid partition reference %u (partitions %u)\n" , + partition, sbi->s_partitions); +return ; + } + + map = &sbi->s_partmaps[partition];if (check_add_overflow (bloc->logicalBlockNum, offset, &blk) ||check_add_overflow (blk, count, &blk) || - bloc->logicalBlockNum + count > map->s_partition_len) { + blk > map->s_partition_len) { udf_debug("Invalid request to free blocks: (%d, %u), off %u, " "len %u, partition len %u\n", partition, bloc->logicalBlockNum, offset, count,Signature · 1 line
2.54.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR