[PULL for-8.0 0/2] last minute hw/nvme coverity fixes

[PULL for-8.0 0/2] last minute hw/nvme coverity fixes

[Klaus Jensen]

From: Klaus Jensen <k.jensen@samsung.com>

Hi Peter,

The following changes since commit 6c50845a9183610cfd4cfffd48dfc704cd340882:

  hw/i2c/allwinner-i2c: Fix subclassing of TYPE_AW_I2C_SUN6I (2023-04-11 14:13:29 +0100)

are available in the Git repository at:

  git://git.infradead.org/qemu-nvme.git tags/coverity-fixes-pull-request

for you to fetch changes up to 4b32319cdacd99be983e1a74128289ef52c5964e:

  hw/nvme: fix memory leak in nvme_dsm (2023-04-12 12:03:09 +0200)

----------------------------------------------------------------
hw/nvme coverity fixes

Fix two issues reported by coverity (CID 1451080 and 1451082).

----------------------------------------------------------------

Klaus Jensen (2):
  hw/nvme: fix memory leak in fdp ruhid parsing
  hw/nvme: fix memory leak in nvme_dsm

 hw/nvme/ctrl.c | 3 +++
 hw/nvme/ns.c   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.39.2

[PULL for-8.0 1/2] hw/nvme: fix memory leak in fdp ruhid parsing

[Klaus Jensen]

From: Klaus Jensen <k.jensen@samsung.com>

Coverity reports a memory leak of memory when parsing ruhids at
namespace initialization. Since this is just working memory, not needed
beyond the scope of the functions, fix this by adding a g_autofree
annotation.

Reported-by: Coverity (CID 1507979)
Fixes: 73064edfb864 ("hw/nvme: flexible data placement emulation")
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
 hw/nvme/ns.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index cfac960dcf39..547c0b154312 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -399,7 +399,8 @@ static bool nvme_ns_init_fdp(NvmeNamespace *ns, Error **errp)
     NvmeEnduranceGroup *endgrp = ns->endgrp;
     NvmeRuHandle *ruh;
     uint8_t lbafi = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
-    unsigned int *ruhid, *ruhids;
+    g_autofree unsigned int *ruhids = NULL;
+    unsigned int *ruhid;
     char *r, *p, *token;
     uint16_t *ph;
 
-- 
2.39.2

[PULL for-8.0 2/2] hw/nvme: fix memory leak in nvme_dsm

[Klaus Jensen]

From: Klaus Jensen <k.jensen@samsung.com>

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.

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 8b7be1420912..ac24eeb5ed5a 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -2619,6 +2619,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.39.2

Re: [PULL for-8.0 0/2] last minute hw/nvme coverity fixes

[Peter Maydell]

On Wed, 12 Apr 2023 at 11:04, Klaus Jensen <its@irrelevant.dk> wrote:
>
> From: Klaus Jensen <k.jensen@samsung.com>
>
> Hi Peter,
>
> The following changes since commit 6c50845a9183610cfd4cfffd48dfc704cd340882:
>
>   hw/i2c/allwinner-i2c: Fix subclassing of TYPE_AW_I2C_SUN6I (2023-04-11 14:13:29 +0100)
>
> are available in the Git repository at:
>
>   git://git.infradead.org/qemu-nvme.git tags/coverity-fixes-pull-request
>
> for you to fetch changes up to 4b32319cdacd99be983e1a74128289ef52c5964e:
>
>   hw/nvme: fix memory leak in nvme_dsm (2023-04-12 12:03:09 +0200)
>
> ----------------------------------------------------------------
> hw/nvme coverity fixes
>
> Fix two issues reported by coverity (CID 1451080 and 1451082).
>
> ----------------------------------------------------------------
>
> Klaus Jensen (2):
>   hw/nvme: fix memory leak in fdp ruhid parsing
>   hw/nvme: fix memory leak in nvme_dsm


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.

-- PMM