diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-02-03 12:37:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-02-03 12:37:02 -0700 |
| commit | e8db8c9cadacab5694b0d1bd5f6b3ba6a234a34c (patch) | |
| tree | e22751b23d385afd136d273e464879d7b3cc1bd8 /drivers/nvme/host/tcp.c | |
| parent | aace2b7a93ca48dc075af8526394bc5d43b5b148 (diff) | |
| parent | 6a51abdeb259a56d95f13cc67e3a0838bcda0377 (diff) | |
| download | linux-e8db8c9cadacab5694b0d1bd5f6b3ba6a234a34c.tar.gz linux-e8db8c9cadacab5694b0d1bd5f6b3ba6a234a34c.tar.bz2 linux-e8db8c9cadacab5694b0d1bd5f6b3ba6a234a34c.zip | |
Merge tag 'nvme-5.17-2022-02-03' of git://git.infradead.org/nvme into block-5.17
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 5.17
- fix a use-after-free in rdm and tcp controller reset (Sagi Grimberg)
- fix the state check in nvmf_ctlr_matches_baseopts (Uday Shankar)"
* tag 'nvme-5.17-2022-02-03' of git://git.infradead.org/nvme:
nvme-fabrics: fix state check in nvmf_ctlr_matches_baseopts()
nvme-rdma: fix possible use-after-free in transport error_recovery work
nvme-tcp: fix possible use-after-free in transport error_recovery work
nvme: fix a possible use-after-free in controller reset during load
Diffstat (limited to 'drivers/nvme/host/tcp.c')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4ceb28675fdf..01e24b5703db 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2096,6 +2096,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl; nvme_stop_keep_alive(ctrl); + flush_work(&ctrl->async_event_work); nvme_tcp_teardown_io_queues(ctrl, false); /* unquiesce to fail fast pending requests */ nvme_start_queues(ctrl); |