From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org,
ZiyangZhang <ZiyangZhang@linux.alibaba.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Jonathan Corbet <corbet@lwn.net>, Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V4 2/6] ublk_drv: don't probe partitions if the ubq daemon isn't trusted
Date: Fri, 6 Jan 2023 12:17:07 +0800 [thread overview]
Message-ID: <20230106041711.914434-3-ming.lei@redhat.com> (raw)
In-Reply-To: <20230106041711.914434-1-ming.lei@redhat.com>
If any ubq daemon is unprivileged, the ublk char device is allowed
for unprivileged user actually, and we can't trust the current user,
so not probe partitions.
Fixes: 71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
Reviewed-by: ZiyangZhang <ZiyangZhang@linux.alibaba.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/block/ublk_drv.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index f1cad20442df..44c5c1392d40 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -159,6 +159,7 @@ struct ublk_device {
struct completion completion;
unsigned int nr_queues_ready;
+ unsigned int nr_privileged_daemon;
/*
* Our ubq->daemon may be killed without any notification, so
@@ -1178,6 +1179,9 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq)
ubq->ubq_daemon = current;
get_task_struct(ubq->ubq_daemon);
ub->nr_queues_ready++;
+
+ if (capable(CAP_SYS_ADMIN))
+ ub->nr_privileged_daemon++;
}
if (ub->nr_queues_ready == ub->dev_info.nr_hw_queues)
complete_all(&ub->completion);
@@ -1534,6 +1538,10 @@ static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd)
if (ret)
goto out_put_disk;
+ /* don't probe partitions if any one ubq daemon is un-trusted */
+ if (ub->nr_privileged_daemon != ub->nr_queues_ready)
+ set_bit(GD_SUPPRESS_PART_SCAN, &disk->state);
+
get_device(&ub->cdev_dev);
ret = add_disk(disk);
if (ret) {
@@ -1935,6 +1943,7 @@ static int ublk_ctrl_start_recovery(struct io_uring_cmd *cmd)
/* set to NULL, otherwise new ubq_daemon cannot mmap the io_cmd_buf */
ub->mm = NULL;
ub->nr_queues_ready = 0;
+ ub->nr_privileged_daemon = 0;
init_completion(&ub->completion);
ret = 0;
out_unlock:
--
2.31.1
next prev parent reply other threads:[~2023-01-06 4:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 4:17 [PATCH V4 0/6] ublk_drv: add mechanism for supporting unprivileged ublk device Ming Lei
2023-01-06 4:17 ` [PATCH V4 1/6] ublk_drv: remove nr_aborted_queues from ublk_device Ming Lei
2023-01-06 4:17 ` Ming Lei [this message]
2023-01-06 4:17 ` [PATCH V4 3/6] ublk_drv: move ublk_get_device_from_id into ublk_ctrl_uring_cmd Ming Lei
2023-01-06 4:17 ` [PATCH V4 4/6] ublk_drv: add device parameter UBLK_PARAM_TYPE_DEVT Ming Lei
2023-01-06 4:17 ` [PATCH V4 5/6] ublk_drv: add module parameter of ublks_max for limiting max allowed ublk dev Ming Lei
2023-01-06 4:17 ` [PATCH V4 6/6] ublk_drv: add mechanism for supporting unprivileged ublk device Ming Lei
2023-01-06 15:33 ` kernel test robot
2023-01-17 9:36 ` [PATCH V4 0/6] " Ming Lei
2023-01-17 17:23 ` Jens Axboe
2023-01-30 22:20 ` Stefan Hajnoczi
2023-01-31 2:30 ` Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230106041711.914434-3-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=ZiyangZhang@linux.alibaba.com \
--cc=axboe@kernel.dk \
--cc=corbet@lwn.net \
--cc=linux-block@vger.kernel.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.