Skip to content

Commit c503118

Browse files
committed
md: fix resync softlockup when bitmap size is less than array size
jira LE-1907 cve CVE-2024-38598 Rebuild_History Non-Buildable kernel-4.18.0-553.16.1.el8_10 commit-author Yu Kuai <[email protected]> commit f0e729a Is is reported that for dm-raid10, lvextend + lvchange --syncaction will trigger following softlockup: kernel:watchdog: BUG: soft lockup - CPU#3 stuck for 26s! [mdX_resync:6976] CPU: 7 PID: 3588 Comm: mdX_resync Kdump: loaded Not tainted 6.9.0-rc4-next-20240419 #1 RIP: 0010:_raw_spin_unlock_irq+0x13/0x30 Call Trace: <TASK> md_bitmap_start_sync+0x6b/0xf0 raid10_sync_request+0x25c/0x1b40 [raid10] md_do_sync+0x64b/0x1020 md_thread+0xa7/0x170 kthread+0xcf/0x100 ret_from_fork+0x30/0x50 ret_from_fork_asm+0x1a/0x30 And the detailed process is as follows: md_do_sync j = mddev->resync_min while (j < max_sectors) sectors = raid10_sync_request(mddev, j, &skipped) if (!md_bitmap_start_sync(..., &sync_blocks)) // md_bitmap_start_sync set sync_blocks to 0 return sync_blocks + sectors_skippe; // sectors = 0; j += sectors; // j never change Root cause is that commit 301867b ("md/raid10: check slab-out-of-bounds in md_bitmap_get_counter") return early from md_bitmap_get_counter(), without setting returned blocks. Fix this problem by always set returned blocks from md_bitmap_get_counter"(), as it used to be. Noted that this patch just fix the softlockup problem in kernel, the case that bitmap size doesn't match array size still need to be fixed. Fixes: 301867b ("md/raid10: check slab-out-of-bounds in md_bitmap_get_counter") Reported-and-tested-by: Nigel Croxon <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Yu Kuai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Song Liu <[email protected]> (cherry picked from commit f0e729a) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 483389f commit c503118

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/md/md-bitmap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,7 +1417,7 @@ __acquires(bitmap->lock)
14171417
sector_t chunk = offset >> bitmap->chunkshift;
14181418
unsigned long page = chunk >> PAGE_COUNTER_SHIFT;
14191419
unsigned long pageoff = (chunk & PAGE_COUNTER_MASK) << COUNTER_BYTE_SHIFT;
1420-
sector_t csize;
1420+
sector_t csize = ((sector_t)1) << bitmap->chunkshift;
14211421
int err;
14221422

14231423
if (page >= bitmap->pages) {
@@ -1426,6 +1426,7 @@ __acquires(bitmap->lock)
14261426
* End-of-device while looking for a whole page or
14271427
* user set a huge number to sysfs bitmap_set_bits.
14281428
*/
1429+
*blocks = csize - (offset & (csize - 1));
14291430
return NULL;
14301431
}
14311432
err = md_bitmap_checkpage(bitmap, page, create, 0);
@@ -1434,8 +1435,7 @@ __acquires(bitmap->lock)
14341435
bitmap->bp[page].map == NULL)
14351436
csize = ((sector_t)1) << (bitmap->chunkshift +
14361437
PAGE_COUNTER_SHIFT);
1437-
else
1438-
csize = ((sector_t)1) << bitmap->chunkshift;
1438+
14391439
*blocks = csize - (offset & (csize - 1));
14401440

14411441
if (err < 0)

0 commit comments

Comments
 (0)