diff options
authorJens Axboe <>2022-05-17 12:32:05 -0600
committerJens Axboe <>2022-05-17 12:46:04 -0600
commitaa184e8671f0f911fc2fb3f68cd506e4d7838faa (patch)
parent2d2d5cb6ca8424fa849ebb4edb8e8022c13860c7 (diff)
io_uring: don't attempt to IOPOLL for MSG_RING requestsio_uring-5.18-2022-05-18io_uring-5.18
We gate whether to IOPOLL for a request on whether the opcode is allowed on a ring setup for IOPOLL and if it's got a file assigned. MSG_RING is the only one that allows a file yet isn't pollable, it's merely supported to allow communication on an IOPOLL ring, not because we can poll for completion of it. Put the assigned file early and clear it, so we don't attempt to poll for it. Reported-by: Fixes: 3f1d52abf098 ("io_uring: defer msg-ring file validity check until command issue") Signed-off-by: Jens Axboe <>
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 91de361ea9ab..e0823f58f795 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4481,6 +4481,9 @@ done:
if (ret < 0)
__io_req_complete(req, issue_flags, ret, 0);
+ /* put file to avoid an attempt to IOPOLL the req */
+ io_put_file(req->file);
+ req->file = NULL;
return 0;