io_uring: don't check unrelated req->open.how in accept request

[ Upstream commit adf3a9e9f556613197583a1884f0de40a8bb6fb9 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 156c54ebb62b780a81ff4518a6f91951f5854fc3..70e85f64dc3897f1c91bac25870137cea5086bf8 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5154,8 +5154,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;