GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-19 05:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

io_uring: don't modify req->poll for rw

Browse source 
__io_queue_proc() is used by both poll and apoll, so we should not
access req->poll directly but selecting right struct io_poll_iocb
depending on use case.

Reported-and-tested-by: syzbot+a84b8783366ecb1c65d0@syzkaller.appspotmail.com
Fixes: ea6a693d86 ("io_uring: disable multishot poll for double poll add cases")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4a6a1de31142d8e0250fe2dfd4c8923d82a5bbfc.1621251795.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-05-17 12:43:34 +01:00 • committed by Jens Axboe
parent 489809e2e2
commit 7a27472770
1 changed files with 3 additions and 3 deletions

6
fs/io_uring.c
View file

@ -5019,10 +5019,10 @@ static void __io_queue_proc(struct io_poll_iocb *poll, struct io_poll_table *pt,
* Can't handle multishot for double wait for now, turn it * Can't handle multishot for double wait for now, turn it
* into one-shot mode. * into one-shot mode.
*/ */
if (!(req->poll.events & EPOLLONESHOT)) if (!(poll_one->events & EPOLLONESHOT))
req->poll.events |= EPOLLONESHOT; poll_one->events |= EPOLLONESHOT;
/* double add on the same waitqueue head, ignore */ /* double add on the same waitqueue head, ignore */
if (poll->head == head) if (poll_one->head == head)
return; return;
poll = kmalloc(sizeof(*poll), GFP_ATOMIC); poll = kmalloc(sizeof(*poll), GFP_ATOMIC);
if (!poll) { if (!poll) {