diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-10-16 21:55:56 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-10-17 17:25:47 +0200 |
| commit | 58852d4d673760cf7c88b9360b3c24a041bec298 (patch) | |
| tree | 65598b120d54e3a9710c8aa16eb514fe116845d7 | |
| parent | io-wq: inherit audit loginuid and sessionid (diff) | |
| download | linux-58852d4d673760cf7c88b9360b3c24a041bec298.tar.xz linux-58852d4d673760cf7c88b9360b3c24a041bec298.zip | |
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 <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index b9ffe98f18bc..e1726f457461 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5008,6 +5008,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; @@ -5018,7 +5020,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; |