ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: always set out parameter in qemu_rbd_snap_list 

The caller expects psn_tab to be NULL when there are no snapshots or
an error occurs. This results in calling g_free on an invalid address.

Reported-by: Oliver Francke <Oliver@filoo.de>
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Josh Durgin 2011-12-06 17:05:10 -08:00 committed by Kevin Wolf
parent 28c1202ba6
commit b9c532903f
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

@ -805,7 +805,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
} while (snap_count == -ERANGE); } while (snap_count == -ERANGE);
if (snap_count <= 0) { if (snap_count <= 0) {
return snap_count; goto done;
} }
sn_tab = g_malloc0(snap_count * sizeof(QEMUSnapshotInfo)); sn_tab = g_malloc0(snap_count * sizeof(QEMUSnapshotInfo));
@ -824,6 +824,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
} }
rbd_snap_list_end(snaps); rbd_snap_list_end(snaps);
done:
*psn_tab = sn_tab; *psn_tab = sn_tab;
return snap_count; return snap_count;
} }