diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-07-25 18:20:18 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-07-25 18:20:18 +0200 |
| commit | 36703247d5f52a679df9da51192b6950fe81689f (patch) | |
| tree | bad2dab2f508c0e23acfff04cad9389a9209a21e /fs/io_uring.c | |
| parent | drbd: dynamically allocate shash descriptor (diff) | |
| download | linux-36703247d5f52a679df9da51192b6950fe81689f.tar.xz linux-36703247d5f52a679df9da51192b6950fe81689f.zip | |
io_uring: ensure ->list is initialized for poll commands
Daniel reports that when testing an http server that uses io_uring
to poll for incoming connections, sometimes it hard crashes. This is
due to an uninitialized list member for the io_uring request. Normally
this doesn't trigger and none of the test cases caught it.
Reported-by: Daniel Kozak <kozzi11@gmail.com>
Tested-by: Daniel Kozak <kozzi11@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 2039f888197e..15d9b16ed29d 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1666,6 +1666,8 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe) INIT_LIST_HEAD(&poll->wait.entry); init_waitqueue_func_entry(&poll->wait, io_poll_wake); + INIT_LIST_HEAD(&req->list); + mask = vfs_poll(poll->file, &ipt.pt) & poll->events; spin_lock_irq(&ctx->completion_lock); |