diff options
author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-28 20:26:45 +0000 |
---|---|---|
committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-28 20:26:45 +0000 |
commit | 1e72d3b7ad9108fec5cb90d38ddfd00bdf498db2 (patch) | |
tree | 46c01367daf00edfbc695788d4ab8c8037dc91ec /vl.c | |
parent | 5b2575789bf30630d6f1c185ddb239945df96fa5 (diff) | |
download | hqemu-1e72d3b7ad9108fec5cb90d38ddfd00bdf498db2.zip hqemu-1e72d3b7ad9108fec5cb90d38ddfd00bdf498db2.tar.gz |
add format= to drive options (CVE-2008-2004)
It is possible for a guest with a raw formatted disk image to write a
header to that disk image describing another format (such as qcow2).
Stopping and subsequent restart of the guest will cause qemu to detect
that format, and could allow the guest to read any host file if qemu is
sufficiently privileged (typical in virt environments).
The patch defaults to existing behaviour (probing based on file contents),
so it still requires the mgmt app (e.g. libvirt xml) to pass a new
"format=raw" parameter for raw disk images.
Originally noted by Avi Kivity, patch from Chris Wright.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4277 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -4961,6 +4961,7 @@ static int drive_init(struct drive_opt *arg, int snapshot, int bus_id, unit_id; int cyls, heads, secs, translation; BlockDriverState *bdrv; + BlockDriver *drv = NULL; int max_devs; int index; int cache; @@ -4968,7 +4969,7 @@ static int drive_init(struct drive_opt *arg, int snapshot, char *str = arg->opt; char *params[] = { "bus", "unit", "if", "index", "cyls", "heads", "secs", "trans", "media", "snapshot", "file", - "cache", NULL }; + "cache", "format", NULL }; if (check_params(buf, sizeof(buf), params, str) < 0) { fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n", @@ -5136,6 +5137,14 @@ static int drive_init(struct drive_opt *arg, int snapshot, } } + if (get_param_value(buf, sizeof(buf), "format", str)) { + drv = bdrv_find_format(buf); + if (!drv) { + fprintf(stderr, "qemu: '%s' invalid format\n", buf); + return -1; + } + } + if (arg->file == NULL) get_param_value(file, sizeof(file), "file", str); else @@ -5238,7 +5247,7 @@ static int drive_init(struct drive_opt *arg, int snapshot, bdrv_flags |= BDRV_O_SNAPSHOT; if (!cache) bdrv_flags |= BDRV_O_DIRECT; - if (bdrv_open(bdrv, file, bdrv_flags) < 0 || qemu_key_check(bdrv, file)) { + if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv, file)) { fprintf(stderr, "qemu: could not open disk image %s\n", file); return -1; |