Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 1d191b4ca51d ("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>

Gao Xiang a429b761 3a866087

+6 -1
+6 -1
fs/erofs/zmap.c
··· 596 596 vi->z_fragmentoff = map->m_plen; 597 597 if (recsz > offsetof(struct z_erofs_extent, pstart_lo)) 598 598 vi->z_fragmentoff |= map->m_pa << 32; 599 - } else if (map->m_plen) { 599 + } else if (map->m_plen & Z_EROFS_EXTENT_PLEN_MASK) { 600 600 map->m_flags |= EROFS_MAP_MAPPED | 601 601 EROFS_MAP_FULL_MAPPED | EROFS_MAP_ENCODED; 602 602 fmt = map->m_plen >> Z_EROFS_EXTENT_PLEN_FMT_BIT; ··· 715 715 struct erofs_map_blocks *map) 716 716 { 717 717 struct erofs_sb_info *sbi = EROFS_I_SB(inode); 718 + u64 pend; 718 719 719 720 if (!(map->m_flags & EROFS_MAP_ENCODED)) 720 721 return 0; ··· 733 732 if (unlikely(map->m_plen > Z_EROFS_PCLUSTER_MAX_SIZE || 734 733 map->m_llen > Z_EROFS_PCLUSTER_MAX_DSIZE)) 735 734 return -EOPNOTSUPP; 735 + /* Filesystems beyond 48-bit physical block addresses are invalid */ 736 + if (unlikely(check_add_overflow(map->m_pa, map->m_plen, &pend) || 737 + (pend >> sbi->blkszbits) >= BIT_ULL(48))) 738 + return -EFSCORRUPTED; 736 739 return 0; 737 740 } 738 741