]> git.dujemihanovic.xyz Git - linux.git/commitdiff
io_uring: fail NOP if non-zero op flags is passed in
authorMing Lei <ming.lei@redhat.com>
Fri, 10 May 2024 03:50:27 +0000 (11:50 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 10 May 2024 12:09:45 +0000 (06:09 -0600)
The NOP op flags should have been checked from beginning like any other
opcode, otherwise NOP may not be extended with the op flags.

Given both liburing and Rust io-uring crate always zeros SQE op flags, just
ignore users which play raw NOP uring interface without zeroing SQE, because
NOP is just for test purpose. Then we can save one NOP2 opcode.

Suggested-by: Jens Axboe <axboe@kernel.dk>
Fixes: 2b188cc1bb85 ("Add io_uring IO interface")
Cc: stable@vger.kernel.org
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20240510035031.78874-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/nop.c

index d956599a3c1b8f413aab536a3815fc909af523ee..1a4e312dfe510af0c54f8d5243ef4a01926dbb53 100644 (file)
@@ -12,6 +12,8 @@
 
 int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
+       if (READ_ONCE(sqe->rw_flags))
+               return -EINVAL;
        return 0;
 }