From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9Zxr-00011Y-4A for qemu-devel@nongnu.org; Wed, 14 Aug 2013 08:14:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9Zxl-0005PM-2p for qemu-devel@nongnu.org; Wed, 14 Aug 2013 08:14:11 -0400 From: Stefan Hajnoczi Date: Wed, 14 Aug 2013 14:13:52 +0200 Message-Id: <1376482432-24929-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH] rbd: avoid qemu_rbd_snap_list() memory leak when no snapshots List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Josh Durgin , qemu-stable@nongnu.org, Stefan Hajnoczi 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(). Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi --- block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/rbd.c b/block/rbd.c index cb71751..4e26fea 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -934,7 +934,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, do { snaps = g_malloc(sizeof(*snaps) * max_snaps); snap_count = rbd_snap_list(s->image, snaps, &max_snaps); - if (snap_count < 0) { + if (snap_count <= 0) { g_free(snaps); } } while (snap_count == -ERANGE); -- 1.8.3.1