41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 2a3757a66aad487b64afb8935015c408fd9fdcbb Mon Sep 17 00:00:00 2001
|
|
From: wangmeiyang <wangmeiyang@xfusion.com>
|
|
Date: Fri, 28 Apr 2023 12:01:45 +0800
|
|
Subject: [PATCH] hw/nvme: fix memory leak in nvme_dsm
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The iocb (and the allocated memory to hold LBA ranges) leaks if reading
|
|
the LBA ranges fails.
|
|
|
|
Fix this by adding a free and an unref of the iocb.
|
|
|
|
origin commit: https://gitlab.com/qemu-project/qemu/-/commit/4b32319cdacd99be983e1a74128289ef52c5964e
|
|
Signed-off-by: Meiyang Wang <wangmeiyang@xfusion.com>
|
|
Reported-by: Coverity (CID 1508281)
|
|
Fixes: d7d1474fd85d ("hw/nvme: reimplement dsm to allow cancellation")
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
|
|
---
|
|
hw/nvme/ctrl.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
|
|
index 40fbda3b03..5f1515828b 100644
|
|
--- a/hw/nvme/ctrl.c
|
|
+++ b/hw/nvme/ctrl.c
|
|
@@ -2381,6 +2381,9 @@ static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req)
|
|
status = nvme_h2c(n, (uint8_t *)iocb->range, sizeof(NvmeDsmRange) * nr,
|
|
req);
|
|
if (status) {
|
|
+ g_free(iocb->range);
|
|
+ qemu_aio_unref(iocb);
|
|
+
|
|
return status;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|