Commit 03c698f0 authored by Jeff Cody's avatar Jeff Cody
Browse files

block/sheepdog: fix argument passed to qemu_strtoul() 



The function qemu_strtoul() reads 'unsigned long' sized data,
which is larger than uint32_t on 64-bit machines.

Even though the snap_id field in the header is 32-bits, we must
accommodate the full size in qemu_strtoul().

This patch also adds more meaningful error handling to the
qemu_strtoul() call, and subsequent results.

Reported-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarHitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Message-id: e56fc50abedd9a112e0683342c8eafda063cd2f9.1456935548.git.jcody@redhat.com
parent 0ebc03bc

block/sheepdog.c

+7 −4
Original line number Diff line number Diff line
@@ -2549,7 +2549,7 @@ static int sd_snapshot_delete(BlockDriverState *bs, 
                              const char *name,

                              Error **errp)

{

    uint32_t snap_id = 0;

    unsigned long snap_id = 0;

    char snap_tag[SD_MAX_VDI_TAG_LEN];

    Error *local_err = NULL;

    int fd, ret;
@@ -2571,12 +2571,15 @@ static int sd_snapshot_delete(BlockDriverState *bs, 
    memset(buf, 0, sizeof(buf));

    memset(snap_tag, 0, sizeof(snap_tag));

    pstrcpy(buf, SD_MAX_VDI_LEN, s->name);

    if (qemu_strtoul(snapshot_id, NULL, 10, (unsigned long *)&snap_id)) {

        return -1;

    ret = qemu_strtoul(snapshot_id, NULL, 10, &snap_id);

    if (ret || snap_id > UINT32_MAX) {

        error_setg(errp, "Invalid snapshot ID: %s",

                         snapshot_id ? snapshot_id : "<null>");

        return -EINVAL;

    }



    if (snap_id) {

        hdr.snapid = snap_id;

        hdr.snapid = (uint32_t) snap_id;

    } else {

        pstrcpy(snap_tag, sizeof(snap_tag), snapshot_id);

        pstrcpy(buf + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, snap_tag);