Commit aa184e86 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: don't attempt to IOPOLL for MSG_RING requests 



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: default avatar <syzbot+1a0a53300ce782f8b3ad@syzkaller.appspotmail.com>
Fixes: 3f1d52ab ("io_uring: defer msg-ring file validity check until command issue")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2d2d5cb6

fs/io_uring.c

+3 −0
Original line number Diff line number Diff line
@@ -4481,6 +4481,9 @@ static int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags) 
	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;

}