mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: avoid qemu_rbd_snap_list() memory leaks 

When there are no snapshots qemu_rbd_snap_list() returns 0 and the
snapshot table pointer is NULL.  Don't forget to free the snaps buffer
we allocated for librbd rbd_snap_list().

When the function succeeds don't forget to free the snaps buffer after
calling rbd_snap_list_end().

Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2013-09-25 16:00:48 +02:00 committed by Kevin Wolf
parent 5726d872f3
commit 9e6337d081
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/rbd.c
View File

@ -943,7 +943,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
do { do {
snaps = g_malloc(sizeof(*snaps) * max_snaps); snaps = g_malloc(sizeof(*snaps) * max_snaps);
snap_count = rbd_snap_list(s->image, snaps, &max_snaps); snap_count = rbd_snap_list(s->image, snaps, &max_snaps);
if (snap_count < 0) { if (snap_count <= 0) {
g_free(snaps); g_free(snaps);
} }
} while (snap_count == -ERANGE); } while (snap_count == -ERANGE);
@ -967,6 +967,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
sn_info->vm_clock_nsec = 0; sn_info->vm_clock_nsec = 0;
} }
rbd_snap_list_end(snaps); rbd_snap_list_end(snaps);
g_free(snaps);
done: done:
*psn_tab = sn_tab; *psn_tab = sn_tab;