Commit f21d9d44483d12e21a8c7adc05dd382fdb2895d5
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
f4145654aa
udf: Check length of extended attributes and allocation descriptors
commit 23b133bdc452aa441fcb9b82cbf6dd05cfd342d0 upstream. Check length of extended attributes and allocation descriptors when loading inodes from disk. Otherwise corrupted filesystems could confuse the code and make the kernel oops. Reported-by: Carl Henrik Lunde <chlunde@ping.uio.no> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 1 changed file with 9 additions and 0 deletions Side-by-side Diff
fs/udf/inode.c
| ... | ... | @@ -1487,6 +1487,15 @@ |
| 1487 | 1487 | } |
| 1488 | 1488 | inode->i_generation = iinfo->i_unique; |
| 1489 | 1489 | |
| 1490 | + /* | |
| 1491 | + * Sanity check length of allocation descriptors and extended attrs to | |
| 1492 | + * avoid integer overflows | |
| 1493 | + */ | |
| 1494 | + if (iinfo->i_lenEAttr > bs || iinfo->i_lenAlloc > bs) | |
| 1495 | + goto out; | |
| 1496 | + /* Now do exact checks */ | |
| 1497 | + if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > bs) | |
| 1498 | + goto out; | |
| 1490 | 1499 | /* Sanity checks for files in ICB so that we don't get confused later */ |
| 1491 | 1500 | if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { |
| 1492 | 1501 | /* |