Commit bdb2c48e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: explicit sqe padding for ioctl commands

32 bit sqe->cmd_op is an union with 64 bit values. It's always a good
idea to do padding explicitly. Also zero check it in prep, so it can be
used in the future if needed without compatibility concerns.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/e6b95a05e970af79000435166185e85b196b2ba2.1657202417.git.asml.silence@gmail.com
[axboe: turn bitwise OR into logical variant]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 09007af2
...@@ -5066,7 +5066,7 @@ static int io_uring_cmd_prep(struct io_kiocb *req, ...@@ -5066,7 +5066,7 @@ static int io_uring_cmd_prep(struct io_kiocb *req,
{ {
struct io_uring_cmd *ioucmd = &req->uring_cmd; struct io_uring_cmd *ioucmd = &req->uring_cmd;
if (sqe->rw_flags) if (sqe->rw_flags || sqe->__pad1)
return -EINVAL; return -EINVAL;
ioucmd->cmd = sqe->cmd; ioucmd->cmd = sqe->cmd;
ioucmd->cmd_op = READ_ONCE(sqe->cmd_op); ioucmd->cmd_op = READ_ONCE(sqe->cmd_op);
......
...@@ -22,7 +22,10 @@ struct io_uring_sqe { ...@@ -22,7 +22,10 @@ struct io_uring_sqe {
union { union {
__u64 off; /* offset into file */ __u64 off; /* offset into file */
__u64 addr2; __u64 addr2;
struct {
__u32 cmd_op; __u32 cmd_op;
__u32 __pad1;
};
}; };
union { union {
__u64 addr; /* pointer to buffer or iovecs */ __u64 addr; /* pointer to buffer or iovecs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment