io_uring/uring_cmd: correct io_uring_cmd_done() ret type
PATCH 1/1 io_uring/uring_cmd: correct io_uring_cmd_done() ret type
io_uring_cmd_done() takes the result code for the CQE as a ssize_t ret argument. However, the CQE res field is a s32 value, as is the argument to io_req_set_res(). To clarify that only s32 values can be faithfully represented without truncation, change io_uring_cmd_done()'s ret argument type to s32.
--- include/linux/io_uring/cmd.h | 4 ++-- io_uring/uring_cmd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/io_uring/cmd.h +2 -2
@@ -51,11 +51,11 @@ int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd,* and the corresponding io_uring request. * * Note: the caller should never hard code @issue_flags and is only allowed * to pass the mask provided by the core io_uring code. */ -void io_uring_cmd_done (struct io_uring_cmd *cmd,ssize_t ret,u64 res2, +void io_uring_cmd_done (struct io_uring_cmd *cmd,s32 ret,u64 res2,unsigned issue_flags);void __io_uring_cmd_do_in_task (struct io_uring_cmd *ioucmd,void (*task_work_cb)(struct io_uring_cmd *,unsigned ),unsigned flags);
@@ -99,11 +99,11 @@ static inline int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, int ddir, struct iov_iter *iter, unsigned issue_flags) { return -EOPNOTSUPP; } -static inline void io_uring_cmd_done (struct io_uring_cmd *cmd,ssize_t ret, +static inline void io_uring_cmd_done (struct io_uring_cmd *cmd,s32 ret,u64 ret2,unsigned issue_flags) { } static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd, void (*task_work_cb)(struct io_uring_cmd *, unsigned),
io_uring/uring_cmd.c +1 -1
@@ -149,11 +149,11 @@ static inline void io_req_set_cqe32_extra(struct io_kiocb *req,/* * Called by consumers of io_uring_cmd, if they originally returned * -EIOCBQUEUED upon receiving the command. */ -void io_uring_cmd_done (struct io_uring_cmd *ioucmd,ssize_t ret,u64 res2, +void io_uring_cmd_done (struct io_uring_cmd *ioucmd,s32 ret,u64 res2,unsigned issue_flags) {struct io_kiocb *req =cmd_to_io_kiocb (ioucmd);if (WARN_ON_ONCE (req->flags &REQ_F_APOLL_MULTISHOT ))
Signature · 1 line
2.45.2
Quoted 8 lines · Caleb Sander Mateos
io_uring_cmd_done()takes the result code for the CQE as assize_tret argument. However, the CQE res field is a s32 value, as is the argument toio_req_set_res(). To clarify that only s32 values can be faithfully represented without truncation, change io_uring_cmd_done()'s ret argument type to s32.[...]
Applied, thanks!
[1/1] io_uring/uring_cmd: correct io_uring_cmd_done() ret type
commit: dd386b0d5e61556927189cd7b59a628d22cb6851
Best regards,
Signature · 1 line
Jens Axboe