Skip to content

Commit d67ed2c

Browse files
wangjinchaoYuKuai-huawei
authored andcommitted
md/raid1: Fix stack memory use after return in raid1_reshape
In the raid1_reshape function, newpool is allocated on the stack and assigned to conf->r1bio_pool. This results in conf->r1bio_pool.wait.head pointing to a stack address. Accessing this address later can lead to a kernel panic. Example access path: raid1_reshape() { // newpool is on the stack mempool_t newpool, oldpool; // initialize newpool.wait.head to stack address mempool_init(&newpool, ...); conf->r1bio_pool = newpool; } raid1_read_request() or raid1_write_request() { alloc_r1bio() { mempool_alloc() { // if pool->alloc fails remove_element() { --pool->curr_nr; } } } } mempool_free() { if (pool->curr_nr < pool->min_nr) { // pool->wait.head is a stack address // wake_up() will try to access this invalid address // which leads to a kernel panic return; wake_up(&pool->wait); } } Fix: reinit conf->r1bio_pool.wait after assigning newpool. Fixes: afeee51 ("md: convert to bioset_init()/mempool_init()") Signed-off-by: Wang Jinchao <[email protected]> Reviewed-by: Yu Kuai <[email protected]> Link: https://lore.kernel.org/linux-raid/[email protected] Signed-off-by: Yu Kuai <[email protected]>
1 parent 75ef7b8 commit d67ed2c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/md/raid1.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,6 +3428,7 @@ static int raid1_reshape(struct mddev *mddev)
34283428
/* ok, everything is stopped */
34293429
oldpool = conf->r1bio_pool;
34303430
conf->r1bio_pool = newpool;
3431+
init_waitqueue_head(&conf->r1bio_pool.wait);
34313432

34323433
for (d = d2 = 0; d < conf->raid_disks; d++) {
34333434
struct md_rdev *rdev = conf->mirrors[d].rdev;

0 commit comments

Comments
 (0)