Skip to content

Commit 8d33a03

Browse files
Zheng QixingMikulas Patocka
authored andcommitted
dm: fix NULL pointer dereference in __dm_suspend()
There is a race condition between dm device suspend and table load that can lead to null pointer dereference. The issue occurs when suspend is invoked before table load completes: BUG: kernel NULL pointer dereference, address: 0000000000000054 Oops: 0000 [Freescale#1] PREEMPT SMP PTI CPU: 6 PID: 6798 Comm: dmsetup Not tainted 6.6.0-g7e52f5f0ca9b Freescale#62 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 RIP: 0010:blk_mq_wait_quiesce_done+0x0/0x50 Call Trace: <TASK> blk_mq_quiesce_queue+0x2c/0x50 dm_stop_queue+0xd/0x20 __dm_suspend+0x130/0x330 dm_suspend+0x11a/0x180 dev_suspend+0x27e/0x560 ctl_ioctl+0x4cf/0x850 dm_ctl_ioctl+0xd/0x20 vfs_ioctl+0x1d/0x50 __se_sys_ioctl+0x9b/0xc0 __x64_sys_ioctl+0x19/0x30 x64_sys_call+0x2c4a/0x4620 do_syscall_64+0x9e/0x1b0 The issue can be triggered as below: T1 T2 dm_suspend table_load __dm_suspend dm_setup_md_queue dm_mq_init_request_queue blk_mq_init_allocated_queue => q->mq_ops = set->ops; (1) dm_stop_queue / dm_wait_for_completion => q->tag_set NULL pointer! (2) => q->tag_set = set; (3) Fix this by checking if a valid table (map) exists before performing request-based suspend and waiting for target I/O. When map is NULL, skip these table-dependent suspend steps. Even when map is NULL, no I/O can reach any target because there is no table loaded; I/O submitted in this state will fail early in the DM layer. Skipping the table-dependent suspend logic in this case is safe and avoids NULL pointer dereferences. Fixes: c4576ae ("dm: fix request-based dm's use of dm_wait_for_completion") Cc: [email protected] Signed-off-by: Zheng Qixing <[email protected]> Signed-off-by: Mikulas Patocka <[email protected]>
1 parent 7f597c2 commit 8d33a03

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/md/dm.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
29082908
{
29092909
bool do_lockfs = suspend_flags & DM_SUSPEND_LOCKFS_FLAG;
29102910
bool noflush = suspend_flags & DM_SUSPEND_NOFLUSH_FLAG;
2911-
int r;
2911+
int r = 0;
29122912

29132913
lockdep_assert_held(&md->suspend_lock);
29142914

@@ -2960,7 +2960,7 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
29602960
* Stop md->queue before flushing md->wq in case request-based
29612961
* dm defers requests to md->wq from md->queue.
29622962
*/
2963-
if (dm_request_based(md)) {
2963+
if (map && dm_request_based(md)) {
29642964
dm_stop_queue(md->queue);
29652965
set_bit(DMF_QUEUE_STOPPED, &md->flags);
29662966
}
@@ -2972,7 +2972,8 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
29722972
* We call dm_wait_for_completion to wait for all existing requests
29732973
* to finish.
29742974
*/
2975-
r = dm_wait_for_completion(md, task_state);
2975+
if (map)
2976+
r = dm_wait_for_completion(md, task_state);
29762977
if (!r)
29772978
set_bit(dmf_suspended_flag, &md->flags);
29782979

0 commit comments

Comments
 (0)