io_uring: don't attempt to IOPOLL for MSG_RING requests
authorJens Axboe <axboe@kernel.dk>
Tue, 17 May 2022 18:32:05 +0000 (12:32 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 17 May 2022 18:46:04 +0000 (12:46 -0600)
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: syzbot+1a0a53300ce782f8b3ad@syzkaller.appspotmail.com
Fixes: 3f1d52abf098 ("io_uring: defer msg-ring file validity check until command issue")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 91de361ea9aba2d0d83718f150437382235945c1..e0823f58f7959804ecde3eefdc450cf4476f6652 100644 (file)
@@ -4481,6 +4481,9 @@ done:
        if (ret < 0)
                req_set_fail(req);
        __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;
 }