exfat: validate cluster allocation bits of the allocation bitmap
Subsystems (2)
PATCH 1/1 exfat: validate cluster allocation bits of the allocation bitmap
From: Namjae Jeon <[email protected]>
[ Upstream commit 79c1587b6cda74deb0c86fc7ba194b92958c793c ]
syzbot created an exfat image with cluster bits not set for the allocation bitmap. exfat-fs reads and uses the allocation bitmap without checking this. The problem is that if the start cluster of the allocation bitmap is 6, cluster 6 can be allocated when creating a directory with mkdir. exfat zeros out this cluster in exfat_mkdir, which can delete existing entries. This can reallocate the allocated entries. In addition, the allocation bitmap is also zeroed out, so cluster 6 can be reallocated. This patch adds exfat_test_bitmap_range to validate that clusters used for the allocation bitmap are correctly marked as in-use.
[Adapted to 6.1: replaced __le_long/lel_to_cpu word-level bitmap access
with per-bit test_bit_le() calls, as __le_long and lel_to_cpu do not exist in 6.1. Uses same test_bit_le API as rest of exfat bitmap code.]
--- fs/exfat/balloc.c | 54 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 12 deletions(-)
fs/exfat/balloc.c +42 -12
@@ -45,12 +45,37 @@ static const unsigned char used_bit[] = {/* * Allocation Bitmap Management Functions */ +static bool exfat_test_bitmap_range (struct super_block *sb,unsigned int clu, +unsigned int count) +{ +struct exfat_sb_info *sbi =EXFAT_SB (sb); +unsigned int start = clu; +unsigned int end = clu + count; +unsigned int ent_idx, i, b; + +if (!is_valid_cluster (sbi, start) || !is_valid_cluster (sbi, end -1 )) +return false; + +while (start < end) { + ent_idx =CLUSTER_TO_BITMAP_ENT (start); + i =BITMAP_OFFSET_SECTOR_INDEX (sb, ent_idx); + b =BITMAP_OFFSET_BIT_IN_SECTOR (sb, ent_idx); + +if (!test_bit_le (b, sbi->vol_amap[i]->b_data)) +return false; + + start++; + } + +return true; +} +static int exfat_allocate_bitmap (struct super_block *sb,struct exfat_dentry *ep) {struct exfat_sb_info *sbi =EXFAT_SB (sb);long long map_size; -unsigned int i, need_map_size; +unsigned int i, j, need_map_size;sector_t sector; sbi->map_clu =le32_to_cpu (ep->dentry.bitmap.start_clu);
@@ -77,20 +102,25 @@ static int exfat_allocate_bitmap(struct super_block *sb, sector =exfat_cluster_to_sector (sbi, sbi->map_clu);for (i =0 ; i < sbi->map_sectors; i++) { sbi->vol_amap[i] =sb_bread (sb, sector + i); -if (!sbi->vol_amap[i]) { -/* release all buffers and free vol_amap */ -int j =0 ; - -while (j < i) -brelse (sbi->vol_amap[j++]); - -kvfree (sbi->vol_amap); - sbi->vol_amap =NULL ; -return -EIO ; - } +if (!sbi->vol_amap[i]) + goto err_out; } +if (exfat_test_bitmap_range (sb, sbi->map_clu, +EXFAT_B_TO_CLU_ROUND_UP (map_size, sbi)) == false) + goto err_out; +return 0 ; + +err_out: + j =0 ; +/* release all buffers and free vol_amap */ +while (j < i) +brelse (sbi->vol_amap[j++]); + +kvfree (sbi->vol_amap); + sbi->vol_amap =NULL ; +return -EIO ; }int exfat_load_bitmap (struct super_block *sb)
Signature · 1 line
2.47.3