81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From 67577f8a8310b1233bddfdaa1099bf6371b79d51 Mon Sep 17 00:00:00 2001
|
|
From: tangzhongrui <tangzhongrui@cmss.chinamobile.com>
|
|
Date: Thu, 3 Aug 2023 11:01:42 +0800
|
|
Subject: [PATCH] xen-block: Avoid leaks on new error path
|
|
|
|
Commit 189829399070 ("xen-block: Use specific blockdev driver")
|
|
introduced a new error path, without taking care of allocated
|
|
resources.
|
|
|
|
So only allocate the qdicts after the error check, and free both
|
|
`filename` and `driver` when we are about to return and thus taking
|
|
care of both success and error path.
|
|
|
|
Coverity only spotted the leak of qdicts (*_layer variables).
|
|
|
|
Reported-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Fixes: Coverity CID 1508722, 1398649
|
|
Fixes: 189829399070 ("xen-block: Use specific blockdev driver")
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
Reviewed-by: Paul Durrant <paul@xen.org>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Message-Id: <20230704171819.42564-1-anthony.perard@citrix.com>
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
|
|
Signed-off-by: Zhongrui Tang <tangzhongrui_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/block/xen-block.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
|
|
index 674953f1ad..6d90621e02 100644
|
|
--- a/hw/block/xen-block.c
|
|
+++ b/hw/block/xen-block.c
|
|
@@ -760,14 +760,15 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
drive = g_new0(XenBlockDrive, 1);
|
|
drive->id = g_strdup(id);
|
|
|
|
- file_layer = qdict_new();
|
|
- driver_layer = qdict_new();
|
|
-
|
|
rc = stat(filename, &st);
|
|
if (rc) {
|
|
error_setg_errno(errp, errno, "Could not stat file '%s'", filename);
|
|
goto done;
|
|
}
|
|
+
|
|
+ file_layer = qdict_new();
|
|
+ driver_layer = qdict_new();
|
|
+
|
|
if (S_ISBLK(st.st_mode)) {
|
|
qdict_put_str(file_layer, "driver", "host_device");
|
|
} else {
|
|
@@ -775,7 +776,6 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
}
|
|
|
|
qdict_put_str(file_layer, "filename", filename);
|
|
- g_free(filename);
|
|
|
|
if (mode && *mode != 'w') {
|
|
qdict_put_bool(file_layer, "read-only", true);
|
|
@@ -810,7 +810,6 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
qdict_put_str(file_layer, "locking", "off");
|
|
|
|
qdict_put_str(driver_layer, "driver", driver);
|
|
- g_free(driver);
|
|
|
|
qdict_put(driver_layer, "file", file_layer);
|
|
|
|
@@ -821,6 +820,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
qobject_unref(driver_layer);
|
|
|
|
done:
|
|
+ g_free(filename);
|
|
+ g_free(driver);
|
|
if (*errp) {
|
|
xen_block_drive_destroy(drive, NULL);
|
|
return NULL;
|
|
--
|
|
2.41.0.windows.1
|
|
|