[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_sn
From: |
Markus Armbruster |
Subject: |
[Qemu-stable] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_snapshot_create() |
Date: |
Wed, 28 May 2014 11:17:06 +0200 |
Has always been leaky. Spotted by Coverity.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
block/sheepdog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 2c3fb01..9a9a307 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2149,6 +2149,7 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
/* we don't need to update entire object */
datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
+ inode = g_malloc(datalen);
/* refresh inode. */
fd = connect_to_sdog(s);
@@ -2171,8 +2172,6 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
goto cleanup;
}
- inode = (SheepdogInode *)g_malloc(datalen);
-
ret = read_object(fd, (char *)inode, vid_to_vdi_oid(new_vid),
s->inode.nr_copies, datalen, 0, s->cache_flags);
@@ -2186,6 +2185,7 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
s->inode.name, s->inode.snap_id, s->inode.vdi_id);
cleanup:
+ g_free(inode);
closesocket(fd);
return ret;
}
--
1.9.3
- [Qemu-stable] [PATCH v2 00/14] block: Plug assorted memory leaks, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 02/14] block/vvfat: Plug memory leak in enable_write_target(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 04/14] block: Plug memory leak on brv_open_image() error path, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 01/14] qemu-img: Plug memory leak on block option help error path, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_snapshot_create(),
Markus Armbruster <=
- [Qemu-stable] [PATCH v2 12/14] block/vvfat: Plug memory leak in read_directory(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 10/14] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 11/14] block/vvfat: Plug memory leak in check_directory_consistency(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 05/14] qemu-io: Support multiple -o in open command, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 14/14] qemu-img: Plug memory leak in convert command, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_init(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 07/14] qemu-io: Don't print NULL when open without non-option arg fails, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 06/14] qemu-io: Plug memory leak in open command, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 03/14] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Markus Armbruster, 2014/05/28