[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/14] rbd: always set out parameter in qemu_rbd_sna
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 08/14] rbd: always set out parameter in qemu_rbd_snap_list |
Date: |
Thu, 15 Dec 2011 15:09:23 +0100 |
From: Josh Durgin <address@hidden>
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 <address@hidden>
Signed-off-by: Josh Durgin <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/rbd.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 312584a..7a2384c 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -805,7 +805,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
} while (snap_count == -ERANGE);
if (snap_count <= 0) {
- return snap_count;
+ goto done;
}
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);
+ done:
*psn_tab = sn_tab;
return snap_count;
}
--
1.7.6.4
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 01/14] block: bdrv_aio_* do not return NULL, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 02/14] block: simplify failure handling for bdrv_aio_multiwrite, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 06/14] block: avoid useless checks on acb->bh, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 03/14] block: qemu_aio_get does not return NULL, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 07/14] block/qcow2.c: call qcow2_free_snapshots in the function of qcow2_close, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 04/14] dma: the passed io_func does not return NULL, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 08/14] rbd: always set out parameter in qemu_rbd_snap_list,
Kevin Wolf <=
- [Qemu-devel] [PATCH 05/14] block: dma_bdrv_* does not return NULL, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 11/14] qcow2: Allow >4 GB VM state, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 09/14] qemu-img rebase: Fix for undersized backing files, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 13/14] block/cow: Return real error code, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 14/14] qiov: prevent double free or use-after-free, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 10/14] Documentation: Add qemu-img -t parameter in man page, Kevin Wolf, 2011/12/15
- [Qemu-devel] [PATCH 12/14] coroutine: switch per-thread free pool to a global pool, Kevin Wolf, 2011/12/15
- Re: [Qemu-devel] [PULL 00/14] Block patches, Anthony Liguori, 2011/12/19