Skip to content

Commit ea129e5

Browse files
govind-varadaraxboe
authored andcommitted
io_uring: Add size check for sqe->cmd
For SQE128, sqe->cmd provides 80 bytes for uring_cmd. Add macro to check if size of user struct does not exceed 80 bytes at compile time. User doesn't have to track this manually during development. Replace io_uring_sqe_cmd() inline func with macro and add io_uring_sqe128_cmd() which checks struct size for 16 bytes cmd and 80 bytes cmd respectively. Signed-off-by: Govindarajulu Varadarajan <govind.varadar@gmail.com> Reviewed-by: Caleb Sander Mateos <csander@purestorage.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 42a6bd5 commit ea129e5

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

drivers/block/ublk_drv.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,8 @@ static int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,
32553255
unsigned int issue_flags)
32563256
{
32573257
/* May point to userspace-mapped memory */
3258-
const struct ublksrv_io_cmd *ub_src = io_uring_sqe_cmd(cmd->sqe);
3258+
const struct ublksrv_io_cmd *ub_src = io_uring_sqe_cmd(cmd->sqe,
3259+
struct ublksrv_io_cmd);
32593260
u16 buf_idx = UBLK_INVALID_BUF_IDX;
32603261
struct ublk_device *ub = cmd->file->private_data;
32613262
struct ublk_queue *ubq;
@@ -3833,7 +3834,8 @@ static int ublk_validate_batch_fetch_cmd(struct ublk_batch_io_data *data)
38333834
static int ublk_handle_non_batch_cmd(struct io_uring_cmd *cmd,
38343835
unsigned int issue_flags)
38353836
{
3836-
const struct ublksrv_io_cmd *ub_cmd = io_uring_sqe_cmd(cmd->sqe);
3837+
const struct ublksrv_io_cmd *ub_cmd = io_uring_sqe_cmd(cmd->sqe,
3838+
struct ublksrv_io_cmd);
38373839
struct ublk_device *ub = cmd->file->private_data;
38383840
unsigned tag = READ_ONCE(ub_cmd->tag);
38393841
unsigned q_id = READ_ONCE(ub_cmd->q_id);
@@ -3862,7 +3864,8 @@ static int ublk_handle_non_batch_cmd(struct io_uring_cmd *cmd,
38623864
static int ublk_ch_batch_io_uring_cmd(struct io_uring_cmd *cmd,
38633865
unsigned int issue_flags)
38643866
{
3865-
const struct ublk_batch_io *uc = io_uring_sqe_cmd(cmd->sqe);
3867+
const struct ublk_batch_io *uc = io_uring_sqe_cmd(cmd->sqe,
3868+
struct ublk_batch_io);
38663869
struct ublk_device *ub = cmd->file->private_data;
38673870
struct ublk_batch_io_data data = {
38683871
.ub = ub,
@@ -5253,7 +5256,8 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
52535256
unsigned int issue_flags)
52545257
{
52555258
/* May point to userspace-mapped memory */
5256-
const struct ublksrv_ctrl_cmd *ub_src = io_uring_sqe_cmd(cmd->sqe);
5259+
const struct ublksrv_ctrl_cmd *ub_src = io_uring_sqe128_cmd(cmd->sqe,
5260+
struct ublksrv_ctrl_cmd);
52575261
struct ublksrv_ctrl_cmd header;
52585262
struct ublk_device *ub = NULL;
52595263
u32 cmd_op = cmd->cmd_op;

drivers/nvme/host/ioctl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
447447
struct io_uring_cmd *ioucmd, unsigned int issue_flags, bool vec)
448448
{
449449
struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
450-
const struct nvme_uring_cmd *cmd = io_uring_sqe_cmd(ioucmd->sqe);
450+
const struct nvme_uring_cmd *cmd = io_uring_sqe128_cmd(ioucmd->sqe,
451+
struct nvme_uring_cmd);
451452
struct request_queue *q = ns ? ns->queue : ctrl->admin_q;
452453
struct nvme_uring_data d;
453454
struct nvme_command c;

fs/fuse/dev_uring.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,8 @@ static int fuse_ring_ent_set_commit(struct fuse_ring_ent *ent)
879879
static int fuse_uring_commit_fetch(struct io_uring_cmd *cmd, int issue_flags,
880880
struct fuse_conn *fc)
881881
{
882-
const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe_cmd(cmd->sqe);
882+
const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe128_cmd(cmd->sqe,
883+
struct fuse_uring_cmd_req);
883884
struct fuse_ring_ent *ent;
884885
int err;
885886
struct fuse_ring *ring = fc->ring;
@@ -1083,7 +1084,8 @@ fuse_uring_create_ring_ent(struct io_uring_cmd *cmd,
10831084
static int fuse_uring_register(struct io_uring_cmd *cmd,
10841085
unsigned int issue_flags, struct fuse_conn *fc)
10851086
{
1086-
const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe_cmd(cmd->sqe);
1087+
const struct fuse_uring_cmd_req *cmd_req = io_uring_sqe128_cmd(cmd->sqe,
1088+
struct fuse_uring_cmd_req);
10871089
struct fuse_ring *ring = smp_load_acquire(&fc->ring);
10881090
struct fuse_ring_queue *queue;
10891091
struct fuse_ring_ent *ent;

include/linux/io_uring/cmd.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,17 @@ struct io_uring_cmd {
2020
u8 unused[8];
2121
};
2222

23-
static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
24-
{
25-
return sqe->cmd;
26-
}
23+
#define io_uring_sqe128_cmd(sqe, type) ({ \
24+
BUILD_BUG_ON(sizeof(type) > ((2 * sizeof(struct io_uring_sqe)) - \
25+
offsetof(struct io_uring_sqe, cmd))); \
26+
(const type *)(sqe)->cmd; \
27+
})
28+
29+
#define io_uring_sqe_cmd(sqe, type) ({ \
30+
BUILD_BUG_ON(sizeof(type) > (sizeof(struct io_uring_sqe) - \
31+
offsetof(struct io_uring_sqe, cmd))); \
32+
(const type *)(sqe)->cmd; \
33+
})
2734

2835
static inline void io_uring_cmd_private_sz_check(size_t cmd_sz)
2936
{

0 commit comments

Comments
 (0)