Skip to content

Commit

Permalink
block/sheepdog: Plug memory leak in sd_snapshot_create()
Browse files Browse the repository at this point in the history
Has always been leaky.  Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
Markus Armbruster authored and kevmw committed May 30, 2014
1 parent b122c3b commit 2df5fee
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions block/sheepdog.c
Expand Up @@ -2176,6 +2176,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, &local_err);
Expand All @@ -2202,8 +2203,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);

Expand All @@ -2217,6 +2216,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;
}
Expand Down

0 comments on commit 2df5fee

Please sign in to comment.