nvme: avoid double free special payload

[ Upstream commit e5d574ab37f5f2e7937405613d9b1a724811e5ad ]

If a discard request needs to be retried, and that retry may fail before
a new special payload is added, a double free will result. Clear the
RQF_SPECIAL_LOAD when the request is cleaned.

Signed-off-by: Chunguang Xu <chunguang.xu@shopee.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d513fd27589dfe645ee4eeefe3c8fed1d532b803..36f30594b671f0b12192cb0aa1d2f99194734392 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -998,6 +998,7 @@ void nvme_cleanup_cmd(struct request *req)
                        clear_bit_unlock(0, &ctrl->discard_page_busy);
                else
                        kfree(bvec_virt(&req->special_vec));
+               req->rq_flags &= ~RQF_SPECIAL_PAYLOAD;
        }
 }
 EXPORT_SYMBOL_GPL(nvme_cleanup_cmd);