From: Pavel Begunkov Date: Tue, 21 Jun 2022 23:00:36 +0000 (+0100) Subject: io_uring: fix wrong arm_poll error handling X-Git-Tag: microblaze-v6.1~260^2~9 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=9d2ad2947a53abf5e5e6527a9eeed50a3a4cbc72;p=linux-2.6-microblaze.git io_uring: fix wrong arm_poll error handling Leaving ip.error set when a request was punted to task_work execution is problematic, don't forget to clear it. Fixes: aa43477b04025 ("io_uring: poll rework") Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/a6c84ef4182c6962380aebe11b35bdcb25b0ccfb.1655852245.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- diff --git a/fs/io_uring.c b/fs/io_uring.c index d5ea3c6167b5..cb719a53b8bd 100644 --- 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;