io_uring: remove duplicated member check for io_msg_ring_prep()
authorJens Axboe <axboe@kernel.dk>
Sat, 12 Mar 2022 13:50:13 +0000 (06:50 -0700)
committerJens Axboe <axboe@kernel.dk>
Sat, 12 Mar 2022 13:50:13 +0000 (06:50 -0700)
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: 4f57f06ce218 ("io_uring: add support for IORING_OP_MSG_RING command")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 229b31d..299154e 100644 (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,
                            const struct io_uring_sqe *sqe)
 {
-       if (unlikely(sqe->addr || sqe->ioprio || sqe->buf_index ||
-                    sqe->rw_flags || sqe->splice_fd_in || sqe->buf_index ||
-                    sqe->personality))
+       if (unlikely(sqe->addr || sqe->ioprio || sqe->rw_flags ||
+                    sqe->splice_fd_in || sqe->buf_index || sqe->personality))
                return -EINVAL;
 
        if (req->file->f_op != &io_uring_fops)