Patchwork rbd: always set out parameter in qemu_rbd_snap_list

login
register
mail settings
Submitter Josh Durgin
Date Dec. 7, 2011, 1:05 a.m.
Message ID <1323219910-17021-1-git-send-email-josh.durgin@dreamhost.com>
Download mbox | patch
Permalink /patch/129861/
State New
Headers show

Comments

Josh Durgin - Dec. 7, 2011, 1:05 a.m.
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>
---
 block/rbd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Kevin Wolf - Dec. 7, 2011, 10:27 a.m.
Am 07.12.2011 02:05, schrieb Josh Durgin:
> 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>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/rbd.c b/block/rbd.c
index 9088c52..54a6961 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -793,55 +793,56 @@  static int qemu_rbd_snap_create(BlockDriverState *bs,
 static int qemu_rbd_snap_list(BlockDriverState *bs,
                               QEMUSnapshotInfo **psn_tab)
 {
     BDRVRBDState *s = bs->opaque;
     QEMUSnapshotInfo *sn_info, *sn_tab = NULL;
     int i, snap_count;
     rbd_snap_info_t *snaps;
     int max_snaps = RBD_MAX_SNAPS;
 
     do {
         snaps = g_malloc(sizeof(*snaps) * max_snaps);
         snap_count = rbd_snap_list(s->image, snaps, &max_snaps);
         if (snap_count < 0) {
             g_free(snaps);
         }
     } while (snap_count == -ERANGE);
 
     if (snap_count <= 0) {
-        return snap_count;
+        goto done;
     }
 
     sn_tab = g_malloc0(snap_count * sizeof(QEMUSnapshotInfo));
 
     for (i = 0; i < snap_count; i++) {
         const char *snap_name = snaps[i].name;
 
         sn_info = sn_tab + i;
         pstrcpy(sn_info->id_str, sizeof(sn_info->id_str), snap_name);
         pstrcpy(sn_info->name, sizeof(sn_info->name), snap_name);
 
         sn_info->vm_state_size = snaps[i].size;
         sn_info->date_sec = 0;
         sn_info->date_nsec = 0;
         sn_info->vm_clock_nsec = 0;
     }
     rbd_snap_list_end(snaps);
 
+ done:
     *psn_tab = sn_tab;
     return snap_count;
 }
 
 static QEMUOptionParameter qemu_rbd_create_options[] = {
     {
      .name = BLOCK_OPT_SIZE,
      .type = OPT_SIZE,
      .help = "Virtual disk size"
     },
     {
      .name = BLOCK_OPT_CLUSTER_SIZE,
      .type = OPT_SIZE,
      .help = "RBD object size"
     },
     {NULL}
 };