From: Klaus Jensen <its@irrelevant.dk>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>,
qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>
Subject: [PATCH 2/2] hw/nvme: fix memory leak in nvme_dsm
Date: Tue, 11 Apr 2023 21:04:48 +0200 [thread overview]
Message-ID: <20230411190448.64863-3-its@irrelevant.dk> (raw)
In-Reply-To: <20230411190448.64863-1-its@irrelevant.dk>
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")
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
next prev parent reply other threads:[~2023-04-11 19:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 19:04 [PATCH 0/2] hw/nvme: coverity fixes Klaus Jensen
2023-04-11 19:04 ` [PATCH 1/2] hw/nvme: fix memory leak in fdp ruhid parsing Klaus Jensen
2023-04-12 9:47 ` Philippe Mathieu-Daudé
2023-04-11 19:04 ` Klaus Jensen [this message]
2023-04-12 9:54 ` [PATCH 2/2] hw/nvme: fix memory leak in nvme_dsm Philippe Mathieu-Daudé
2023-04-12 10:02 ` Klaus Jensen
2023-04-12 9:40 ` [PATCH 0/2] hw/nvme: coverity fixes Klaus Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230411190448.64863-3-its@irrelevant.dk \
--to=its@irrelevant.dk \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).