Skip to content

Commit 6240f43

Browse files
Ming Leiaxboe
authored andcommitted
ublk: enhance check for register/unregister io buffer command
The simple check of UBLK_IO_FLAG_OWNED_BY_SRV can avoid incorrect register/unregister io buffer easily, so check it before calling starting to register/un-register io buffer. Also only allow io buffer register/unregister uring_cmd in case of UBLK_F_SUPPORT_ZERO_COPY. Also mark argument 'ublk_queue *' of ublk_register_io_buf as const. Reviewed-by: Caleb Sander Mateos <csander@purestorage.com> Fixes: 1f6540e ("ublk: zc register/unregister bvec") Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20250429022941.1718671-4-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 69edf98 commit 6240f43

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

drivers/block/ublk_drv.c

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ struct ublk_params_header {
201201
static void ublk_stop_dev_unlocked(struct ublk_device *ub);
202202
static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq);
203203
static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
204-
struct ublk_queue *ubq, int tag, size_t offset);
204+
const struct ublk_queue *ubq, int tag, size_t offset);
205205
static inline unsigned int ublk_req_build_flags(struct request *req);
206206
static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ubq,
207207
int tag);
@@ -1949,13 +1949,20 @@ static void ublk_io_release(void *priv)
19491949
}
19501950

19511951
static int ublk_register_io_buf(struct io_uring_cmd *cmd,
1952-
struct ublk_queue *ubq, unsigned int tag,
1952+
const struct ublk_queue *ubq, unsigned int tag,
19531953
unsigned int index, unsigned int issue_flags)
19541954
{
19551955
struct ublk_device *ub = cmd->file->private_data;
1956+
const struct ublk_io *io = &ubq->ios[tag];
19561957
struct request *req;
19571958
int ret;
19581959

1960+
if (!ublk_support_zero_copy(ubq))
1961+
return -EINVAL;
1962+
1963+
if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))
1964+
return -EINVAL;
1965+
19591966
req = __ublk_check_and_get_req(ub, ubq, tag, 0);
19601967
if (!req)
19611968
return -EINVAL;
@@ -1971,8 +1978,17 @@ static int ublk_register_io_buf(struct io_uring_cmd *cmd,
19711978
}
19721979

19731980
static int ublk_unregister_io_buf(struct io_uring_cmd *cmd,
1981+
const struct ublk_queue *ubq, unsigned int tag,
19741982
unsigned int index, unsigned int issue_flags)
19751983
{
1984+
const struct ublk_io *io = &ubq->ios[tag];
1985+
1986+
if (!ublk_support_zero_copy(ubq))
1987+
return -EINVAL;
1988+
1989+
if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV))
1990+
return -EINVAL;
1991+
19761992
return io_buffer_unregister_bvec(cmd, index, issue_flags);
19771993
}
19781994

@@ -2076,7 +2092,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
20762092
case UBLK_IO_REGISTER_IO_BUF:
20772093
return ublk_register_io_buf(cmd, ubq, tag, ub_cmd->addr, issue_flags);
20782094
case UBLK_IO_UNREGISTER_IO_BUF:
2079-
return ublk_unregister_io_buf(cmd, ub_cmd->addr, issue_flags);
2095+
return ublk_unregister_io_buf(cmd, ubq, tag, ub_cmd->addr, issue_flags);
20802096
case UBLK_IO_FETCH_REQ:
20812097
ret = ublk_fetch(cmd, ubq, io, ub_cmd->addr);
20822098
if (ret)
@@ -2128,7 +2144,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
21282144
}
21292145

21302146
static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
2131-
struct ublk_queue *ubq, int tag, size_t offset)
2147+
const struct ublk_queue *ubq, int tag, size_t offset)
21322148
{
21332149
struct request *req;
21342150

0 commit comments

Comments
 (0)