io_uring: fix wrong arm_poll error handling

isilence · axboe · commit 9d2ad2947a53 · 2022-06-21T17:24:37.000-06:00
Leaving ip.error set when a request was punted to task_work execution is problematic, don't forget to clear it. Fixes: aa43477 ("io_uring: poll rework") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/a6c84ef4182c6962380aebe11b35bdcb25b0ccfb.1655852245.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/fs/io_uring.c b/fs/io_uring.c
@@ -7145,6 +7145,7 @@ static int __io_arm_poll_handler(struct io_kiocb *req,
 		if (unlikely(ipt->error || !ipt->nr_entries)) {
 			poll->events |= EPOLLONESHOT;
 			req->apoll_events |= EPOLLONESHOT;
+			ipt->error = 0;
 		}
 		__io_poll_execute(req, mask, poll->events);
 		return 0;

Original file line number	Diff line number	Diff line change
`@@ -7145,6 +7145,7 @@ static int __io_arm_poll_handler(struct io_kiocb *req,`
`7145`	`7145`	`if (unlikely(ipt->error \|\| !ipt->nr_entries)) {`
`7146`	`7146`	`poll->events \|= EPOLLONESHOT;`
`7147`	`7147`	`req->apoll_events \|= EPOLLONESHOT;`
	`7148`	`+ ipt->error = 0;`
`7148`	`7149`	`}`
`7149`	`7150`	`__io_poll_execute(req, mask, poll->events);`
`7150`	`7151`	`return 0;`