b36d41c519
- cvm : bug fix for undefined reference to 'virtcca_cvm_allowed' while compiling - cvm : bug-fix for incorrect device name check for vhost-user-fs - target/i386: add control bits support for LAM - target/i386: add support for LAM in CPUID enumeration - Add support for the virtcca cvm feature. - target/sparc: use signed denominator in sdiv helper - crypto: Introduce SM4 symmetric cipher algorithm - ppc/vof: Fix unaligned FDT property access - vl: fix "type is NULL" in -vga help - hw/display/bcm2835_fb: fix fb_use_offsets condition - aspeed/smc: Fix possible integer overflow - hw/nvme: fix number of PIDs for FDP RUH update - hw/nvme: fix memory leak in nvme_dsm - hvf: arm: Do not advance PC when raising an exception - physmem: Bail out qemu_ram_block_from_host() for invalid ram addrs Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 0c23d22ea9f160a8e0e0e48b6cb400d7964ae868 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 23 Jul 2024 21:06:08 +0800
|
|
Subject: [PATCH] hw/nvme: fix memory leak in nvme_dsm
|
|
|
|
cheery-pick from c510fe78f1b7c966524489d6ba752107423b20c8
|
|
|
|
The allocated memory to hold LBA ranges leaks in the nvme_dsm function. This
|
|
happens because the allocated memory for iocb->range is not freed in all
|
|
error handling paths.
|
|
|
|
Fix this by adding a free to ensure that the allocated memory is properly freed.
|
|
|
|
ASAN log:
|
|
==3075137==ERROR: LeakSanitizer: detected memory leaks
|
|
|
|
Direct leak of 480 byte(s) in 6 object(s) allocated from:
|
|
#0 0x55f1f8a0eddd in malloc llvm/compiler-rt/lib/asan/asan_malloc_linux.cpp:129:3
|
|
#1 0x7f531e0f6738 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x5e738)
|
|
#2 0x55f1faf1f091 in blk_aio_get block/block-backend.c:2583:12
|
|
#3 0x55f1f945c74b in nvme_dsm hw/nvme/ctrl.c:2609:30
|
|
#4 0x55f1f945831b in nvme_io_cmd hw/nvme/ctrl.c:4470:16
|
|
#5 0x55f1f94561b7 in nvme_process_sq hw/nvme/ctrl.c:7039:29
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: d7d1474fd85d ("hw/nvme: reimplement dsm to allow cancellation")
|
|
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
|
|
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
|
|
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/nvme/ctrl.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
|
|
index 237b5c8871..dd1c962f93 100644
|
|
--- a/hw/nvme/ctrl.c
|
|
+++ b/hw/nvme/ctrl.c
|
|
@@ -2592,6 +2592,7 @@ next:
|
|
done:
|
|
iocb->aiocb = NULL;
|
|
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
|
+ g_free(iocb->range);
|
|
qemu_aio_unref(iocb);
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|