xen-block: Avoid leaks on new error path
PATCH 1/1 xen-block: Avoid leaks on new error path
From: Anthony PERARD <[email protected]>
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).
--- hw/block/xen-block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
hw/block/xen-block.c +6 -5
@@ -781,14 +781,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 {
@@ -796,7 +797,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);
@@ -831,7 +831,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);
@@ -842,6 +841,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 ;
Signature · 1 line
Anthony PERARD
Quoted 11 lines · Anthony PERARD
From: Anthony PERARD <[email protected]>
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
filenameanddriverwhen we are about to return and thus taking care of both success and error path.
Quoted 6 lines
Coverity only spotted the leak of qdicts (
*_layervariables).Reported-by Peter Maydell <[email protected]>Fixes Coverity CID 1508722, 1398649Fixes 189829399070 ("xen-block: Use specific blockdev driver")Signed-off-by Anthony PERARD <[email protected]>
thanks
-- PMM
Quoted 12 lines · Anthony PERARD
From: Anthony PERARD <[email protected]>
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
filenameanddriverwhen we are about to return and thus taking care of both success and error path.Coverity only spotted the leak of qdicts (
*_layervariables).
Quoted 8 lines
Reported-by Peter Maydell <[email protected]>Fixes Coverity CID 1508722, 1398649Fixes 189829399070 ("xen-block: Use specific blockdev driver")Signed-off-by Anthony PERARD <[email protected]>--- hw/block/xen-block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)