Skip to content

Commit 7a2012d

Browse files
Zheng Qixingaloktiwa
authored andcommitted
dm: fix NULL pointer dereference in __dm_suspend()
[ Upstream commit 8d33a030c566e1f105cd5bf27f37940b6367f3be ] 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 [#1] PREEMPT SMP PTI CPU: 6 PID: 6798 Comm: dmsetup Not tainted 6.6.0-g7e52f5f0ca9b #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]> [ omitted DMF_QUEUE_STOPPED flag setting and braces absent in 5.15 ] Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 9dc43ea6a20ff83fe9a5fe4be47ae0fbf2409b98) Signed-off-by: Alok Tiwari <[email protected]>
1 parent 840ffb0 commit 7a2012d

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
@@ -2571,7 +2571,7 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
25712571
{
25722572
bool do_lockfs = suspend_flags & DM_SUSPEND_LOCKFS_FLAG;
25732573
bool noflush = suspend_flags & DM_SUSPEND_NOFLUSH_FLAG;
2574-
int r;
2574+
int r = 0;
25752575

25762576
lockdep_assert_held(&md->suspend_lock);
25772577

@@ -2624,7 +2624,7 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
26242624
* Stop md->queue before flushing md->wq in case request-based
26252625
* dm defers requests to md->wq from md->queue.
26262626
*/
2627-
if (dm_request_based(md))
2627+
if (map && dm_request_based(md))
26282628
dm_stop_queue(md->queue);
26292629

26302630
flush_workqueue(md->wq);
@@ -2634,7 +2634,8 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
26342634
* We call dm_wait_for_completion to wait for all existing requests
26352635
* to finish.
26362636
*/
2637-
r = dm_wait_for_completion(md, task_state);
2637+
if (map)
2638+
r = dm_wait_for_completion(md, task_state);
26382639
if (!r)
26392640
set_bit(dmf_suspended_flag, &md->flags);
26402641

0 commit comments

Comments
 (0)