From 8262cb81f35496b8e1d03026ad738e866fbf2cca Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Feb 28 2008 00:51:07 +0000 Subject: Fix block device checks for extendable disk formats --- diff --git a/xen-3.2.0-block-rw-range-check.patch b/xen-3.2.0-block-rw-range-check.patch index b7d92f1..8d84023 100644 --- a/xen-3.2.0-block-rw-range-check.patch +++ b/xen-3.2.0-block-rw-range-check.patch @@ -1,41 +1,79 @@ -changeset: 17093:e3c722d483f5 -user: Keir Fraser -date: Wed Feb 20 17:46:10 2008 +0000 -files: tools/ioemu/block.c -description: -ioemu: Do proper block device extent checks. -Signed-off-by: Ian Jackson - - -diff -r 511ab2b89ced -r e3c722d483f5 tools/ioemu/block.c ---- a/tools/ioemu/block.c Wed Feb 20 17:42:12 2008 +0000 -+++ b/tools/ioemu/block.c Wed Feb 20 17:46:10 2008 +0000 -@@ -120,6 +120,24 @@ void path_combine(char *dest, int dest_s +diff -rup xen-3.2.0.orig/tools/ioemu/block.c xen-3.2.0.new/tools/ioemu/block.c +--- xen-3.2.0.orig/tools/ioemu/block.c 2008-02-27 19:46:11.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/block.c 2008-02-27 19:47:16.000000000 -0500 +@@ -120,6 +120,60 @@ void path_combine(char *dest, int dest_s } } -+static int bdrv_rw_badreq_sectors(BlockDriverState *bs, -+ int64_t sector_num, int nb_sectors) ++static int bdrv_rd_badreq_sectors(BlockDriverState *bs, ++ int64_t sector_num, int nb_sectors) +{ + return -+ nb_sectors < 0 || -+ nb_sectors > bs->total_sectors || -+ sector_num > bs->total_sectors - nb_sectors; ++ nb_sectors < 0 || ++ sector_num < 0 || ++ nb_sectors > bs->total_sectors || ++ sector_num > bs->total_sectors - nb_sectors; +} + -+static int bdrv_rw_badreq_bytes(BlockDriverState *bs, -+ int64_t offset, int count) ++static int bdrv_rd_badreq_bytes(BlockDriverState *bs, ++ int64_t offset, int count) +{ + int64_t size = bs->total_sectors << SECTOR_BITS; + return -+ count < 0 || -+ count > size || -+ offset > size - count; ++ count < 0 || ++ size < 0 || ++ count > size || ++ offset > size - count; +} ++ ++static int bdrv_wr_badreq_sectors(BlockDriverState *bs, ++ int64_t sector_num, int nb_sectors) ++{ ++ if (sector_num < 0 || ++ nb_sectors < 0) ++ return 1; ++ ++ if (sector_num > bs->total_sectors - nb_sectors) { ++ if (bs->autogrow) ++ bs->total_sectors = sector_num + nb_sectors; ++ else ++ return 1; ++ } ++ return 0; ++} ++ ++static int bdrv_wr_badreq_bytes(BlockDriverState *bs, ++ int64_t offset, int count) ++{ ++ int64_t size = bs->total_sectors << SECTOR_BITS; ++ if (count < 0 || ++ offset < 0) ++ return 1; ++ ++ if (offset > size - count) { ++ if (bs->autogrow) ++ bs->total_sectors = (offset + count + SECTOR_SIZE - 1) >> SECTOR_BITS; ++ else ++ return 1; ++ } ++ return 0; ++} ++ void bdrv_register(BlockDriver *bdrv) { -@@ -372,6 +390,7 @@ int bdrv_open2(BlockDriverState *bs, con +@@ -328,6 +382,10 @@ int bdrv_open2(BlockDriverState *bs, con + bs->read_only = 0; + bs->is_temporary = 0; + bs->encrypted = 0; ++ bs->autogrow = 0; ++ ++ if (flags & BDRV_O_AUTOGROW) ++ bs->autogrow = 1; + + if (flags & BDRV_O_SNAPSHOT) { + BlockDriverState *bs1; +@@ -372,6 +430,7 @@ int bdrv_open2(BlockDriverState *bs, con } bs->drv = drv; bs->opaque = qemu_mallocz(drv->instance_size); @@ -43,82 +81,134 @@ diff -r 511ab2b89ced -r e3c722d483f5 tools/ioemu/block.c if (bs->opaque == NULL && drv->instance_size > 0) return -1; /* Note: for compatibility, we open disk image files as RDWR, and -@@ -437,6 +456,7 @@ void bdrv_close(BlockDriverState *bs) +@@ -437,6 +496,7 @@ void bdrv_close(BlockDriverState *bs) bs->drv = NULL; /* call the change callback */ -+ bs->total_sectors = 0; ++ bs->total_sectors = 0; bs->media_changed = 1; if (bs->change_cb) bs->change_cb(bs->change_opaque); -@@ -502,9 +522,8 @@ int bdrv_read(BlockDriverState *bs, int6 - if (!drv) - return -ENOMEDIUM; +@@ -505,6 +565,8 @@ int bdrv_read(BlockDriverState *bs, int6 + if (sector_num < 0) + return -EINVAL; -- if (sector_num < 0) -- return -EINVAL; -- -+ if (bdrv_rw_badreq_sectors(bs, sector_num, nb_sectors)) -+ return -EDOM; ++ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors)) ++ return -EDOM; if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { memcpy(buf, bs->boot_sector_data, 512); sector_num++; -@@ -542,8 +561,8 @@ int bdrv_write(BlockDriverState *bs, int +@@ -542,8 +604,8 @@ int bdrv_write(BlockDriverState *bs, int return -ENOMEDIUM; if (bs->read_only) return -EACCES; - if (sector_num < 0) - return -EINVAL; -+ if (bdrv_rw_badreq_sectors(bs, sector_num, nb_sectors)) -+ return -EDOM; ++ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors)) ++ return -EDOM; if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { memcpy(bs->boot_sector_data, buf, 512); } -@@ -666,6 +685,8 @@ int bdrv_pread(BlockDriverState *bs, int +@@ -666,6 +728,8 @@ int bdrv_pread(BlockDriverState *bs, int return -ENOMEDIUM; if (!drv->bdrv_pread) return bdrv_pread_em(bs, offset, buf1, count1); -+ if (bdrv_rw_badreq_bytes(bs, offset, count1)) -+ return -EDOM; ++ if (bdrv_rd_badreq_bytes(bs, offset, count1)) ++ return -EDOM; return drv->bdrv_pread(bs, offset, buf1, count1); } -@@ -681,6 +702,8 @@ int bdrv_pwrite(BlockDriverState *bs, in +@@ -681,6 +745,8 @@ int bdrv_pwrite(BlockDriverState *bs, in return -ENOMEDIUM; if (!drv->bdrv_pwrite) return bdrv_pwrite_em(bs, offset, buf1, count1); -+ if (bdrv_rw_badreq_bytes(bs, offset, count1)) -+ return -EDOM; ++ if (bdrv_wr_badreq_bytes(bs, offset, count1)) ++ return -EDOM; return drv->bdrv_pwrite(bs, offset, buf1, count1); } -@@ -922,6 +945,8 @@ int bdrv_write_compressed(BlockDriverSta +@@ -922,6 +988,8 @@ int bdrv_write_compressed(BlockDriverSta return -ENOMEDIUM; if (!drv->bdrv_write_compressed) return -ENOTSUP; -+ if (bdrv_rw_badreq_sectors(bs, sector_num, nb_sectors)) -+ return -EDOM; ++ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors)) ++ return -EDOM; return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors); } -@@ -1067,7 +1092,9 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri +@@ -1067,6 +1135,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri if (!drv) return NULL; -- -+ if (bdrv_rw_badreq_sectors(bs, sector_num, nb_sectors)) -+ return NULL; -+ ++ if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors)) ++ return NULL; + /* XXX: we assume that nb_sectors == 0 is suppored by the async read */ if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { - memcpy(buf, bs->boot_sector_data, 512); -@@ -1089,6 +1116,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr +@@ -1089,6 +1159,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr return NULL; if (bs->read_only) return NULL; -+ if (bdrv_rw_badreq_sectors(bs, sector_num, nb_sectors)) -+ return NULL; ++ if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors)) ++ return NULL; if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) { memcpy(bs->boot_sector_data, buf, 512); } - +diff -rup xen-3.2.0.orig/tools/ioemu/block_int.h xen-3.2.0.new/tools/ioemu/block_int.h +--- xen-3.2.0.orig/tools/ioemu/block_int.h 2008-01-16 13:34:59.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/block_int.h 2008-02-27 19:46:39.000000000 -0500 +@@ -87,6 +87,7 @@ struct BlockDriverState { + int removable; /* if true, the media can be removed */ + int locked; /* if true, the media cannot temporarily be ejected */ + int encrypted; /* if true, the media is encrypted */ ++ int autogrow; /* if true, the backing store can auto-extend to allocate new extents */ + /* event callback when inserting/removing */ + void (*change_cb)(void *opaque); + void *change_opaque; +diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow2.c xen-3.2.0.new/tools/ioemu/block-qcow2.c +--- xen-3.2.0.orig/tools/ioemu/block-qcow2.c 2008-01-16 13:34:59.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/block-qcow2.c 2008-02-27 19:46:39.000000000 -0500 +@@ -191,7 +191,7 @@ static int qcow_open(BlockDriverState *b + int len, i, shift, ret; + QCowHeader header; + +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) +diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow.c xen-3.2.0.new/tools/ioemu/block-qcow.c +--- xen-3.2.0.orig/tools/ioemu/block-qcow.c 2008-01-16 13:34:59.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/block-qcow.c 2008-02-27 19:46:39.000000000 -0500 +@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b + int len, i, shift, ret; + QCowHeader header; + +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header)) +diff -rup xen-3.2.0.orig/tools/ioemu/block-vmdk.c xen-3.2.0.new/tools/ioemu/block-vmdk.c +--- xen-3.2.0.orig/tools/ioemu/block-vmdk.c 2008-01-16 13:34:59.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/block-vmdk.c 2008-02-27 19:46:39.000000000 -0500 +@@ -352,7 +352,7 @@ static int vmdk_open(BlockDriverState *b + uint32_t magic; + int l1_size, i, ret; + +- ret = bdrv_file_open(&s->hd, filename, flags); ++ ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW); + if (ret < 0) + return ret; + if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic)) +diff -rup xen-3.2.0.orig/tools/ioemu/vl.h xen-3.2.0.new/tools/ioemu/vl.h +--- xen-3.2.0.orig/tools/ioemu/vl.h 2008-01-16 13:34:59.000000000 -0500 ++++ xen-3.2.0.new/tools/ioemu/vl.h 2008-02-27 19:46:39.000000000 -0500 +@@ -611,6 +611,7 @@ typedef struct QEMUSnapshotInfo { + use a disk image format on top of + it (default for + bdrv_file_open()) */ ++#define BDRV_O_AUTOGROW 0x0040 /* Allow backing file to extend when writing past end of file */ + + void bdrv_init(void); + BlockDriver *bdrv_find_format(const char *format_name); diff --git a/xen.spec b/xen.spec index 623d230..bf39ea9 100644 --- a/xen.spec +++ b/xen.spec @@ -2,7 +2,7 @@ # Always set these 3 tags %define base_version 3.2.0 -%define base_release 9 +%define base_release 10 # Hypervisor ABI %define hv_abi 3.2 @@ -457,6 +457,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Wed Feb 27 2008 Daniel P. Berrange - 3.2.0-10.fc9 +- Fix block device checks for extendable disk formats + * Wed Feb 27 2008 Daniel P. Berrange - 3.2.0-9.fc9 - Let XenD setup QEMU logfile (rhbz #435164) - Fix PVFB use of event channel filehandle