[PATCH] hw/nvme: Fix memory leak in nvme_dsm

[PATCH] hw/nvme: Fix memory leak in nvme_dsm

[Zheyu Ma]

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

Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
---
 hw/nvme/ctrl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 127c3d2383..cf610eab21 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.34.1

RE: [PATCH] hw/nvme: Fix memory leak in nvme_dsm

[Xingtao Yao (Fujitsu) via]

> -----Original Message-----
> From: qemu-devel-bounces+yaoxt.fnst=fujitsu.com@nongnu.org
> <qemu-devel-bounces+yaoxt.fnst=fujitsu.com@nongnu.org> On Behalf Of Zheyu
> Ma
> Sent: Wednesday, July 3, 2024 7:13 AM
> To: Keith Busch <kbusch@kernel.org>; Klaus Jensen <its@irrelevant.dk>; Jesper
> Devantier <foss@defmacro.it>
> Cc: Zheyu Ma <zheyuma97@gmail.com>; qemu-block@nongnu.org;
> qemu-devel@nongnu.org
> Subject: [PATCH] hw/nvme: Fix memory leak in nvme_dsm
> 
> 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
> 
> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
> ---
>  hw/nvme/ctrl.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 127c3d2383..cf610eab21 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.34.1
> 

Reviewed-by: Xingtao Yao <yaoxt.fnst@fujitsu.com>

Re: [PATCH] hw/nvme: Fix memory leak in nvme_dsm

[Klaus Jensen]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

On Jul  3 01:13, Zheyu Ma wrote:
> 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
> 
> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
> ---
>  hw/nvme/ctrl.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 127c3d2383..cf610eab21 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.34.1
> 

Thanks! LGTM

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Fixes: d7d1474fd85d ("hw/nvme: reimplement dsm to allow cancellation")
Cc: qemu-stable@nongnu.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]