rpms/kvm/F-7 kvm-36-block-rw-range-check.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kvm.spec, 1.16, 1.17

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/extras/rpms/kvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10294

Modified Files:
	.cvsignore kvm.spec 
Added Files:
	kvm-36-block-rw-range-check.patch 
Log Message:
Fix block device extents check (rhbz #433560)

kvm-36-block-rw-range-check.patch:

--- NEW FILE kvm-36-block-rw-range-check.patch ---
diff -rup kvm-36.orig/qemu/block.c kvm-36.new/qemu/block.c
--- kvm-36.orig/qemu/block.c	2007-08-21 10:09:33.000000000 -0400
+++ kvm-36.new/qemu/block.c	2008-02-23 11:24:37.000000000 -0500
@@ -120,6 +120,24 @@ void path_combine(char *dest, int dest_s
     }
 }
 
+static int bdrv_rw_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;
+}
+
+static int bdrv_rw_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;
+}
 
 void bdrv_register(BlockDriver *bdrv)
 {
@@ -372,6 +390,7 @@ int bdrv_open2(BlockDriverState *bs, con
     }
     bs->drv = drv;
     bs->opaque = qemu_mallocz(drv->instance_size);
+    bs->total_sectors = 0; /* driver will set if it does not do getlength */
     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)
         bs->drv = NULL;
 
         /* call the change callback */
+	bs->total_sectors = 0;
         bs->media_changed = 1;
         if (bs->change_cb)
             bs->change_cb(bs->change_opaque);
@@ -502,6 +522,8 @@ int bdrv_read(BlockDriverState *bs, int6
     if (!drv)
         return -ENOMEDIUM;
 
+    if (bdrv_rw_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++;
@@ -539,6 +561,8 @@ int bdrv_write(BlockDriverState *bs, int
         return -ENOMEDIUM;
     if (bs->read_only)
         return -EACCES;
+    if (bdrv_rw_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);   
     }
@@ -661,6 +685,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;
     return drv->bdrv_pread(bs, offset, buf1, count1);
 }
 
@@ -676,6 +702,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;
     return drv->bdrv_pwrite(bs, offset, buf1, count1);
 }
 
@@ -932,6 +960,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;
     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
 }
     
@@ -1077,6 +1107,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
 
     if (!drv)
         return NULL;
+    if (bdrv_rw_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) {
@@ -1099,6 +1131,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 (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
         memcpy(bs->boot_sector_data, buf, 512);   
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 May 2007 15:48:16 -0000	1.9
+++ .cvsignore	23 Feb 2008 16:33:23 -0000	1.10
@@ -1 +1,5 @@
-kvm-24.tar.gz
+.build*.log
+*.rpm
+i686
+x86_64
+kvm-*.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/F-7/kvm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kvm.spec	9 Nov 2007 14:40:00 -0000	1.16
+++ kvm.spec	23 Feb 2008 16:33:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 36
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -16,6 +16,7 @@
 Patch103: qemu-0.9.0-vnc-authentication.patch
 Patch104: kvm-rtl8139-checksum.patch
 Patch105: kvm-36-pxeboot.patch
+Patch106: %{name}-%{version}-block-rw-range-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # to build the bios
@@ -52,6 +53,7 @@
 %patch103 -p1 -b .vnc
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -99,6 +101,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Sat Feb 23 2008 Daniel P. Berrange <berrange at redhat.com> - 36-8.fc7
+- Fix block device extents check (rhbz #433560)
+
 * Mon Oct 15 2007 Daniel P. Berrange <berrange at redhat.com> - 36-7
 - Fixed PXE boot when KVM is enabled (rhbz #331191)