io_uring: fix double poll mask init
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 io_uring: fix double poll mask init
__io_queue_proc() is used by both, poll reqs and apoll. Don't use req->poll.events to copy poll mask because for apoll it aliases with private data of the request.
Signed-off-by Pavel Begunkov <[email protected]>
--- fs/io_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/io_uring.c +3 -1
@@ -4890,6 +4890,8 @@ static void __io_queue_proc(struct io_poll_iocb *poll, struct io_poll_table *pt,* for write). Setup a separate io_poll_iocb if this happens. */ if (unlikely (poll->head)) { +struct io_poll_iocb *poll_one = poll; +/* already have a 2nd entry, fail a third attempt */ if (*poll_ptr) { pt->error = -EINVAL ;
@@ -4900,7 +4902,7 @@ static void __io_queue_proc(struct io_poll_iocb *poll, struct io_poll_table *pt, pt->error = -ENOMEM ;return ; } -io_init_poll_iocb (poll, req->poll.events, io_poll_double_wake); +io_init_poll_iocb (poll, poll_one->events, io_poll_double_wake);refcount_inc (&req->refs); poll->wait.private = req; *poll_ptr = poll;
Signature · 1 line
2.24.0
Quoted 3 lines · Pavel Begunkov
__io_queue_proc()is used by both, poll reqs and apoll. Don't usereq->poll.eventsto copy poll mask because for apoll it aliases with private data of the request.
Applied, thanks.
Signature · 1 line
Jens Axboe