summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2022-03-14 17:26:19 -0600
committerJens Axboe <axboe@kernel.dk>2022-03-14 17:29:43 -0600
commit9ccd435817a22cb8c7338c9ba6467ee233d0b22c (patch)
tree67cd6b51721efa3d22aa5f243cfb42db9bdcbc1b
parent80912cef18f16f8fe59d1fb9548d4364342be360 (diff)
io_uring: don't check unrelated req->open.how in accept requestio_uring-5.17-2022-03-18io_uring-5.17
Looks like a victim of too much copy/paste, we should not be looking at req->open.how in accept. The point is to check CLOEXEC and error out, which we don't invalid direct descriptors on exec. Hence any attempt to get a direct descriptor with CLOEXEC is invalid. No harm is done here, outside of potentially causing a spurious -EINVAL for direct accept requests. Fixes: aaa4db12ef7b ("io_uring: accept directly into fixed file table") Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fs/io_uring.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 4715980e9015..fbbd8ae44f88 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5258,8 +5258,7 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
accept->nofile = rlimit(RLIMIT_NOFILE);
accept->file_slot = READ_ONCE(sqe->file_index);
- if (accept->file_slot && ((req->open.how.flags & O_CLOEXEC) ||
- (accept->flags & SOCK_CLOEXEC)))
+ if (accept->file_slot && (accept->flags & SOCK_CLOEXEC))
return -EINVAL;
if (accept->flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
return -EINVAL;