Skip to content

Commit a429b76

Browse files
committed
erofs: fix crafted invalid cases for encoded extents
Robert recently reported two corrupted images that can cause system crashes, which are related to the new encoded extents introduced in Linux 6.15: - The first one [1] has plen != 0 (e.g. plen == 0x2000000) but (plen & Z_EROFS_EXTENT_PLEN_MASK) == 0. It is used to represent special extents such as sparse extents (!EROFS_MAP_MAPPED), but previously only plen == 0 was handled; - The second one [2] has pa 0xffffffffffdcffed and plen 0xb4000, then "cur [0xfffffffffffff000] += bvec.bv_len [0x1000]" in "} while ((cur += bvec.bv_len) < end);" wraps around, causing an out-of-bound access of pcl->compressed_bvecs[] in z_erofs_submit_queue(). EROFS only supports 48-bit physical block addresses (up to 1EiB for 4k blocks), so add a sanity check to enforce this. Fixes: 1d191b4 ("erofs: implement encoded extent metadata") Reported-by: Robert Morris <rtm@csail.mit.edu> Closes: https://lore.kernel.org/r/75022.1759355830@localhost [1] Closes: https://lore.kernel.org/r/80524.1760131149@localhost [2] Reviewed-by: Hongbo Li <lihongbo22@huawei.com> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
1 parent 3a86608 commit a429b76

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

fs/erofs/zmap.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static int z_erofs_map_blocks_ext(struct inode *inode,
596596
vi->z_fragmentoff = map->m_plen;
597597
if (recsz > offsetof(struct z_erofs_extent, pstart_lo))
598598
vi->z_fragmentoff |= map->m_pa << 32;
599-
} else if (map->m_plen) {
599+
} else if (map->m_plen & Z_EROFS_EXTENT_PLEN_MASK) {
600600
map->m_flags |= EROFS_MAP_MAPPED |
601601
EROFS_MAP_FULL_MAPPED | EROFS_MAP_ENCODED;
602602
fmt = map->m_plen >> Z_EROFS_EXTENT_PLEN_FMT_BIT;
@@ -715,6 +715,7 @@ static int z_erofs_map_sanity_check(struct inode *inode,
715715
struct erofs_map_blocks *map)
716716
{
717717
struct erofs_sb_info *sbi = EROFS_I_SB(inode);
718+
u64 pend;
718719

719720
if (!(map->m_flags & EROFS_MAP_ENCODED))
720721
return 0;
@@ -732,6 +733,10 @@ static int z_erofs_map_sanity_check(struct inode *inode,
732733
if (unlikely(map->m_plen > Z_EROFS_PCLUSTER_MAX_SIZE ||
733734
map->m_llen > Z_EROFS_PCLUSTER_MAX_DSIZE))
734735
return -EOPNOTSUPP;
736+
/* Filesystems beyond 48-bit physical block addresses are invalid */
737+
if (unlikely(check_add_overflow(map->m_pa, map->m_plen, &pend) ||
738+
(pend >> sbi->blkszbits) >= BIT_ULL(48)))
739+
return -EFSCORRUPTED;
735740
return 0;
736741
}
737742

0 commit comments

Comments
 (0)