Skip to content

Commit 7ad6ef9

Browse files
lituo1996hailan94
authored andcommitted
md/raid5: fix possible null-pointer dereferences in raid5_store_group_thread_cnt()
The variable mddev->private is first assigned to conf and then checked: conf = mddev->private; if (!conf) ... If conf is NULL, then mddev->private is also NULL. In this case, null-pointer dereferences can occur when calling raid5_quiesce(): raid5_quiesce(mddev, true); raid5_quiesce(mddev, false); since mddev->private is assigned to conf again in raid5_quiesce(), and conf is dereferenced in several places, for example: conf->quiesce = 0; wake_up(&conf->wait_for_quiescent); To fix this issue, the function should unlock mddev and return before invoking raid5_quiesce() when conf is NULL, following the existing pattern in raid5_change_consistency_policy(). Fixes: fa1944b ("md/raid5: Wait sync io to finish before changing group cnt") Signed-off-by: Tuo Li <islituo@gmail.com> Reviewed-by: Xiao Ni <xni@redhat.com> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Link: https://lore.kernel.org/linux-raid/20251225130326.67780-1-islituo@gmail.com Signed-off-by: Yu Kuai <yukuai@fnnas.com>
1 parent 00f6c1b commit 7ad6ef9

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/md/raid5.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7187,12 +7187,14 @@ raid5_store_group_thread_cnt(struct mddev *mddev, const char *page, size_t len)
71877187
err = mddev_suspend_and_lock(mddev);
71887188
if (err)
71897189
return err;
7190+
conf = mddev->private;
7191+
if (!conf) {
7192+
mddev_unlock_and_resume(mddev);
7193+
return -ENODEV;
7194+
}
71907195
raid5_quiesce(mddev, true);
71917196

7192-
conf = mddev->private;
7193-
if (!conf)
7194-
err = -ENODEV;
7195-
else if (new != conf->worker_cnt_per_group) {
7197+
if (new != conf->worker_cnt_per_group) {
71967198
old_groups = conf->worker_groups;
71977199
if (old_groups)
71987200
flush_workqueue(raid5_wq);

0 commit comments

Comments
 (0)