[PATCH] nvme-pci: use correct size to free the hmb buffer

[PATCH] nvme-pci: use correct size to free the hmb buffer

[francis.p]

From: Francis Pravin <francis.p@samsung.com>

dev->host_mem_size value is updated only after the successful buffer
allocation of hmb descriptor. Otherwise, it may have some undefined value.
So, use the correct size to free the hmb buffer when the hmb descriptor
buffer allocation failed.

Signed-off-by: Francis Pravin <francis.p@samsung.com>
---
 drivers/nvme/host/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e2634f437f33..6c119499c5db 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2086,8 +2086,8 @@ static int nvme_alloc_host_mem_single(struct nvme_dev *dev, u64 size)
 			sizeof(*dev->host_mem_descs), &dev->host_mem_descs_dma,
 			GFP_KERNEL);
 	if (!dev->host_mem_descs) {
-		dma_free_noncontiguous(dev->dev, dev->host_mem_size,
-				dev->hmb_sgt, DMA_BIDIRECTIONAL);
+		dma_free_noncontiguous(dev->dev, size, dev->hmb_sgt,
+				DMA_BIDIRECTIONAL);
 		dev->hmb_sgt = NULL;
 		return -ENOMEM;
 	}
-- 
2.43.5

Re: [PATCH] nvme-pci: use correct size to free the hmb buffer

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] nvme-pci: use correct size to free the hmb buffer

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Re: [PATCH] nvme-pci: use correct size to free the hmb buffer

[Keith Busch]

On Fri, Jan 10, 2025 at 05:21:37AM +0530, francis.p@samsung.com wrote:
> From: Francis Pravin <francis.p@samsung.com>
> 
> dev->host_mem_size value is updated only after the successful buffer
> allocation of hmb descriptor. Otherwise, it may have some undefined value.
> So, use the correct size to free the hmb buffer when the hmb descriptor
> buffer allocation failed.

Thanks, applied to nvme-6.14.