falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Message-id: e56fc50abedd9a112e0683342c8eafda063cd2f9.1456935548.git.jcody@redhat.com
This commit is contained in:
Jeff Cody 2016-03-02 11:24:42 -05:00
parent 0ebc03bc06
commit 03c698f0a2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/sheepdog.c
View File

@ -2549,7 +2549,7 @@ static int sd_snapshot_delete(BlockDriverState *bs,
const char *name, const char *name,
Error **errp) Error **errp)
{ {
uint32_t snap_id = 0; unsigned long snap_id = 0;
char snap_tag[SD_MAX_VDI_TAG_LEN]; char snap_tag[SD_MAX_VDI_TAG_LEN];
Error *local_err = NULL; Error *local_err = NULL;
int fd, ret; int fd, ret;
@ -2571,12 +2571,15 @@ static int sd_snapshot_delete(BlockDriverState *bs,
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
memset(snap_tag, 0, sizeof(snap_tag)); memset(snap_tag, 0, sizeof(snap_tag));
pstrcpy(buf, SD_MAX_VDI_LEN, s->name); pstrcpy(buf, SD_MAX_VDI_LEN, s->name);
if (qemu_strtoul(snapshot_id, NULL, 10, (unsigned long *)&snap_id)) { ret = qemu_strtoul(snapshot_id, NULL, 10, &snap_id);
return -1; if (ret || snap_id > UINT32_MAX) {
error_setg(errp, "Invalid snapshot ID: %s",
snapshot_id ? snapshot_id : "<null>");
return -EINVAL;
} }
if (snap_id) { if (snap_id) {
hdr.snapid = snap_id; hdr.snapid = (uint32_t) snap_id;
} else { } else {
pstrcpy(snap_tag, sizeof(snap_tag), snapshot_id); pstrcpy(snap_tag, sizeof(snap_tag), snapshot_id);
pstrcpy(buf + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, snap_tag); pstrcpy(buf + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, snap_tag);