projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c487a5a
)
io_uring: fix wrong arm_poll error handling
author
Pavel Begunkov
<asml.silence@gmail.com>
Tue, 21 Jun 2022 23:00:36 +0000
(
00:00
+0100)
committer
Jens Axboe
<axboe@kernel.dk>
Tue, 21 Jun 2022 23:24:37 +0000
(17:24 -0600)
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 <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>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index d5ea3c6167b55ffb4061e7dd0a8205ce467f4e10..cb719a53b8bd100543db4ac9d0e58ebc2e65fbc9 100644
(file)
--- 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;