diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-15 00:26:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-18 17:57:19 +0100 |
| commit | adf3a9e9f556613197583a1884f0de40a8bb6fb9 (patch) | |
| tree | 3a5e03a64eeba3d1561794d698235aea4e6cf540 /fs/io_uring.c | |
| parent | io_uring: manage provided buffers strictly ordered (diff) | |
| download | linux-adf3a9e9f556613197583a1884f0de40a8bb6fb9.tar.xz linux-adf3a9e9f556613197583a1884f0de40a8bb6fb9.zip | |
io_uring: don't check unrelated req->open.how in accept request
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, as req->open.how.flags overlaps with
req->accept.flags, but it's very confusing and might change if either of
those command structs are modified.
Fixes: aaa4db12ef7b ("io_uring: accept directly into fixed file table")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 690bfeaa609a..2d6ab732f940 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5535,8 +5535,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; |