Commit 2df5fee2 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block/sheepdog: Plug memory leak in sd_snapshot_create() 



Has always been leaky.  Spotted by Coverity.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarBenoit Canet <benoit@irqsave.net>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b122c3b6

block/sheepdog.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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;

}