Skip to content

Commit d6b76e1

Browse files
LiBaokun96riteshharjani
authored andcommitted
ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow
When we calculate the end position of ext4_free_extent, this position may be exactly where ext4_lblk_t (i.e. uint) overflows. For example, if ac_g_ex.fe_logical is 4294965248 and ac_orig_goal_len is 2048, then the computed end is 0x100000000, which is 0. If ac->ac_o_ex.fe_logical is not the first case of adjusting the best extent, that is, new_bex_end > 0, the following BUG_ON will be triggered: ========================================================= kernel BUG at fs/ext4/mballoc.c:5116! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 673 Comm: xfs_io Tainted: G E 6.5.0-rc1+ torvalds#279 RIP: 0010:ext4_mb_new_inode_pa+0xc5/0x430 Call Trace: <TASK> ext4_mb_use_best_found+0x203/0x2f0 ext4_mb_try_best_found+0x163/0x240 ext4_mb_regular_allocator+0x158/0x1550 ext4_mb_new_blocks+0x86a/0xe10 ext4_ext_map_blocks+0xb0c/0x13a0 ext4_map_blocks+0x2cd/0x8f0 ext4_iomap_begin+0x27b/0x400 iomap_iter+0x222/0x3d0 __iomap_dio_rw+0x243/0xcb0 iomap_dio_rw+0x16/0x80 ========================================================= A simple reproducer demonstrating the problem: mkfs.ext4 -F /dev/sda -b 4096 100M mount /dev/sda /tmp/test fallocate -l1M /tmp/test/tmp fallocate -l10M /tmp/test/file fallocate -i -o 1M -l16777203M /tmp/test/file fsstress -d /tmp/test -l 0 -n 100000 -p 8 & sleep 10 && killall -9 fsstress rm -f /tmp/test/tmp xfs_io -c "open -ad /tmp/test/file" -c "pwrite -S 0xff 0 8192" We declare new_bex_start and new_bex_end as correct types and use fex_end() to avoid the problems caused by the ext4_lblk_t overflow above. Fixes: 93cdf49 ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()") Signed-off-by: Baokun Li <[email protected]>
1 parent 245190c commit d6b76e1

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

fs/ext4/mballoc.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5072,8 +5072,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
50725072
pa = ac->ac_pa;
50735073

50745074
if (ac->ac_b_ex.fe_len < ac->ac_orig_goal_len) {
5075-
int new_bex_start;
5076-
int new_bex_end;
5075+
ext4_lblk_t new_bex_start;
5076+
loff_t new_bex_end;
50775077

50785078
/* we can't allocate as much as normalizer wants.
50795079
* so, found space must get proper lstart
@@ -5092,8 +5092,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
50925092
* still cover original start
50935093
* 3. Else, keep the best ex at start of original request.
50945094
*/
5095-
new_bex_end = ac->ac_g_ex.fe_logical +
5096-
EXT4_C2B(sbi, ac->ac_orig_goal_len);
5095+
new_bex_end = fex_end(sbi, &ac->ac_g_ex, &ac->ac_orig_goal_len);
50975096
new_bex_start = new_bex_end - EXT4_C2B(sbi, ac->ac_b_ex.fe_len);
50985097
if (ac->ac_o_ex.fe_logical >= new_bex_start)
50995098
goto adjust_bex;
@@ -5113,8 +5112,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
51135112

51145113
BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical);
51155114
BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len);
5116-
BUG_ON(new_bex_end > (ac->ac_g_ex.fe_logical +
5117-
EXT4_C2B(sbi, ac->ac_orig_goal_len)));
5115+
BUG_ON(new_bex_end >
5116+
fex_end(sbi, &ac->ac_g_ex, &ac->ac_orig_goal_len));
51185117
}
51195118

51205119
pa->pa_lstart = ac->ac_b_ex.fe_logical;

0 commit comments

Comments
 (0)