leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io_uring: remove duplicated member check for io_msg_ring_prep()

Browse Source 
Julia and the kernel test robot report that the prep handling for this
command inadvertently checks one field twice:

fs/io_uring.c:4338:42-56: duplicated argument to && or ||

Get rid of it.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Fixes: 4f57f06ce2 ("io_uring: add support for IORING_OP_MSG_RING command")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2022-03-12 06:50:13 -07:00
parent bcbb7bf6cc
commit f3b6a41eb2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/io_uring.c
View File

@ -4389,9 +4389,8 @@ static int io_nop(struct io_kiocb *req, unsigned int issue_flags)
static int io_msg_ring_prep(struct io_kiocb *req, static int io_msg_ring_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe) const struct io_uring_sqe *sqe)
{ {
if (unlikely(sqe->addr || sqe->ioprio || sqe->buf_index || if (unlikely(sqe->addr || sqe->ioprio || sqe->rw_flags ||
sqe->rw_flags || sqe->splice_fd_in || sqe->buf_index || sqe->splice_fd_in || sqe->buf_index || sqe->personality))
sqe->personality))
return -EINVAL; return -EINVAL;
if (req->file->f_op != &io_uring_fops) if (req->file->f_op != &io_uring_fops)