[V2,RESEND] ublk_drv: fix NULL pointer dereference in ublk_ctrl_start_recovery()

Commit Message

Ming Lei Sept. 4, 2024, 3:13 a.m. UTC

From: Li Nan <[e-mail]>

When two UBLK_CMD_START_USER_RECOVERY commands are submitted, the
first one sets 'ubq->ubq_daemon' to NULL, and the second one triggers
WARN in ublk_queue_reinit() and subsequently a NULL pointer dereference
issue.

Fix it by adding the check in ublk_ctrl_start_recovery() and return
immediately in case of zero 'ub->nr_queues_ready'.

  BUG: kernel NULL pointer dereference, address: 0000000000000028
  RIP: 0010:ublk_ctrl_start_recovery.constprop.0+0x82/0x180
  Call Trace:
   <TASK>
   ? __die+0x20/0x70
   ? page_fault_oops+0x75/0x170
   ? exc_page_fault+0x64/0x140
   ? asm_exc_page_fault+0x22/0x30
   ? ublk_ctrl_start_recovery.constprop.0+0x82/0x180
   ublk_ctrl_uring_cmd+0x4f7/0x6c0
   ? pick_next_task_idle+0x26/0x40
   io_uring_cmd+0x9a/0x1b0
   io_issue_sqe+0x193/0x3f0
   io_wq_submit_work+0x9b/0x390
   io_worker_handle_work+0x165/0x360
   io_wq_worker+0xcb/0x2f0
   ? finish_task_switch.isra.0+0x203/0x290
   ? finish_task_switch.isra.0+0x203/0x290
   ? __pfx_io_wq_worker+0x10/0x10
   ret_from_fork+0x2d/0x50
   ? __pfx_io_wq_worker+0x10/0x10
   ret_from_fork_asm+0x1a/0x30
   </TASK>

Fixes: c732a852b419 ("ublk_drv: add START_USER_RECOVERY and END_USER_RECOVERY support")
Reported-and-tested-by: Changhui Zhong <[e-mail]>
Closes: https://lore.kernel.org/all/[e-mail]
Reviewed-by: Ming Lei <[e-mail]>
Signed-off-by: Li Nan <[e-mail]>
---
v2: add the check to ublk_ctrl_start_recovery().

 drivers/block/ublk_drv.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jens Axboe Sept. 4, 2024, 1:17 p.m. UTC | #1

On Wed, 04 Sep 2024 11:13:48 +0800, Ming Lei wrote:
> When two UBLK_CMD_START_USER_RECOVERY commands are submitted, the
> first one sets 'ubq->ubq_daemon' to NULL, and the second one triggers
> WARN in ublk_queue_reinit() and subsequently a NULL pointer dereference
> issue.
> 
> Fix it by adding the check in ublk_ctrl_start_recovery() and return
> immediately in case of zero 'ub->nr_queues_ready'.
> 
> [...]

Applied, thanks!

[1/1] ublk_drv: fix NULL pointer dereference in ublk_ctrl_start_recovery()
      commit: e58f5142f88320a5b1449f96a146f2f24615c5c7

Best regards,

Patch

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 890c08792ba8..1d53a3f48a0e 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -2663,6 +2663,8 @@  static int ublk_ctrl_start_recovery(struct ublk_device *ub,
 	mutex_lock(&ub->mutex);
 	if (!ublk_can_use_recovery(ub))
 		goto out_unlock;
+	if (!ub->nr_queues_ready)
+		goto out_unlock;
 	/*
 	 * START_RECOVERY is only allowd after:
 	 *