diff options
| author | Ming Lei <ming.lei@redhat.com> | 2023-07-26 22:45:00 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-07-27 07:17:36 -0600 |
| commit | 53e7d08f6d6e214c40db1f51291bb2975c789dc2 (patch) | |
| tree | ead2b833e38d4b73585a5b3f134dce556bb22374 | |
| parent | e0933b526fbfd937c4a8f4e35fcdd49f0e22d411 (diff) | |
| download | xfs-lts-backports-53e7d08f6d6e214c40db1f51291bb2975c789dc2.tar.gz | |
ublk: fail to start device if queue setup is interrupted
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@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230726144502.566785-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/block/ublk_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 1c823750c95af1..7938221f4f7e25 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1847,7 +1847,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); |