From: Keith Busch <kbusch@kernel.org>
Date: Tue, 29 Jul 2025 18:12:47 +0000 (-0700)
Subject: nvme-pci: fix leak on sgl setup error
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4e6e151cf92bbaa0622a4da351ff444e4fd9b865;p=users%2Fjedix%2Flinux-maple.git

nvme-pci: fix leak on sgl setup error

We need to free the descriptor that was allocated. We also don't
necessarily need to unmap each sgl entry, which was previously being
attempted unconditionally.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 071efec25346f..2c6d9506b1725 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -935,7 +935,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct request *req,
 
 	nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, mapped);
 	if (unlikely(iter->status))
-		nvme_free_sgls(req);
+		nvme_unmap_data(req);
 	return iter->status;
 }