]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
udf: validate VAT header length against the VAT inode size
authorBryam Vargas <hexlabsecurity@proton.me>
Fri, 12 Jun 2026 07:53:31 +0000 (02:53 -0500)
committerJan Kara <jack@suse.cz>
Fri, 12 Jun 2026 11:52:46 +0000 (13:52 +0200)
udf_load_vat() takes the virtual partition's start offset straight from
the on-disk VAT 2.0 header without checking it against the VAT inode
size:

map->s_type_specific.s_virtual.s_start_offset =
le16_to_cpu(vat20->lengthHeader);
map->s_type_specific.s_virtual.s_num_entries =
(sbi->s_vat_inode->i_size -
map->s_type_specific.s_virtual.s_start_offset) >> 2;

lengthHeader is a fully attacker-controlled 16-bit value.  If it exceeds
the VAT inode size, the s_num_entries subtraction underflows to a huge
count, which defeats the "block > s_num_entries" bound in
udf_get_pblock_virt15(); and on the ICB-inline path that function reads

((__le32 *)(iinfo->i_data + s_start_offset))[block]

so a large s_start_offset indexes past the inode's in-ICB data.  Mounting
a crafted UDF image with a virtual (VAT) partition then triggers an
out-of-bounds read.

Reject a VAT whose header length does not leave room for at least one
entry within the VAT inode.

Fixes: fa5e08156335 ("udf: Handle VAT packed inside inode properly")
Cc: stable@vger.kernel.org
Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me>
Link: https://patch.msgid.link/20260612-b4-disp-9a2317ee-v1-1-fefef5736154@proton.me
Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/super.c

index d75bfc7339751e25581e799b92b890c02ab46054..1b5282790de6f08869edd4daf7d82c29f64d9c65 100644 (file)
@@ -1263,6 +1263,14 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
 
                map->s_type_specific.s_virtual.s_start_offset =
                        le16_to_cpu(vat20->lengthHeader);
+               if (map->s_type_specific.s_virtual.s_start_offset
+                   > sbi->s_vat_inode->i_size) {
+                       udf_err(sb, "Corrupted VAT header length %u (VAT inode size %lld)\n",
+                               map->s_type_specific.s_virtual.s_start_offset,
+                               sbi->s_vat_inode->i_size);
+                       brelse(bh);
+                       return -EFSCORRUPTED;
+               }
                map->s_type_specific.s_virtual.s_num_entries =
                        (sbi->s_vat_inode->i_size -
                                map->s_type_specific.s_virtual.