Patch "ublk: fail to start device if queue setup is interrupted" has been added to the 6.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    ublk: fail to start device if queue setup is interrupted

to the 6.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ublk-fail-to-start-device-if-queue-setup-is-interrup.patch
and it can be found in the queue-6.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3caabe5782f8d58cefa0cbfcfe78bc3837a8f148
Author: Ming Lei <ming.lei@xxxxxxxxxx>
Date:   Wed Jul 26 22:45:00 2023 +0800

    ublk: fail to start device if queue setup is interrupted
    
    [ Upstream commit 53e7d08f6d6e214c40db1f51291bb2975c789dc2 ]
    
    In ublk_ctrl_start_dev(), if wait_for_completion_interruptible() is
    interrupted by signal, queues aren't setup successfully yet, so we
    have to fail UBLK_CMD_START_DEV, otherwise kernel oops can be triggered.
    
    Reported by German when working on qemu-storage-deamon which requires
    single thread ublk daemon.
    
    Fixes: 71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
    Reported-by: German Maglione <gmaglione@xxxxxxxxxx>
    Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230726144502.566785-2-ming.lei@xxxxxxxxxx
    Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 33d3298a0da16..dc2856d1241fc 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1632,7 +1632,8 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, struct io_uring_cmd *cmd)
 	if (ublksrv_pid <= 0)
 		return -EINVAL;
 
-	wait_for_completion_interruptible(&ub->completion);
+	if (wait_for_completion_interruptible(&ub->completion) != 0)
+		return -EINTR;
 
 	schedule_delayed_work(&ub->monitor_work, UBLK_DAEMON_MONITOR_PERIOD);
 



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux