Date: Monday, November 3, 2014 @ 21:39:48 Author: tpowa Revision: 225593
remove not needed patch #42128 Modified: qemu/trunk/PKGBUILD Deleted: qemu/trunk/2.0.0-usb-stack.patch -----------------------+ 2.0.0-usb-stack.patch | 36 ------------------------------------ PKGBUILD | 12 ++---------- 2 files changed, 2 insertions(+), 46 deletions(-) Deleted: 2.0.0-usb-stack.patch =================================================================== --- 2.0.0-usb-stack.patch 2014-11-03 20:36:29 UTC (rev 225592) +++ 2.0.0-usb-stack.patch 2014-11-03 20:39:48 UTC (rev 225593) @@ -1,36 +0,0 @@ -Correct post load checks: -1. dev->setup_len == sizeof(dev->data_buf) - seems fine, no need to fail migration -2. When state is DATA, passing index > len - will cause memcpy with negative length, - resulting in heap overflow - -First of the issues was reported by dgilbert. - -Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com> -Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com> ---- - -changes from v1: -- drop state check -- lightly tested - - hw/usb/bus.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/usb/bus.c b/hw/usb/bus.c -index e48b19f..ff1dfe6 100644 ---- a/hw/usb/bus.c -+++ b/hw/usb/bus.c - <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id) - } - if (dev->setup_index < 0 || - dev->setup_len < 0 || -- dev->setup_index >= sizeof(dev->data_buf) || -- dev->setup_len >= sizeof(dev->data_buf)) { -+ dev->setup_index > dev->setup_len || -+ dev->setup_len > sizeof(dev->data_buf)) { - return -EINVAL; - } - return 0; - Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-03 20:36:29 UTC (rev 225592) +++ PKGBUILD 2014-11-03 20:39:48 UTC (rev 225593) @@ -14,15 +14,8 @@ replaces=('qemu-kvm') options=(!strip) source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - 65-kvm.rules - 2.0.0-usb-stack.patch) + 65-kvm.rules) -prepare () -{ - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch" -} - build () { cd "${srcdir}/${pkgname}-${pkgver}" @@ -96,5 +89,4 @@ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } md5sums=('0ff197c4ed4b695620bc4734e77c888f' - '33ab286a20242dda7743a900f369d68a' - 'f98a479ec4e656403f5f05b1914f7f1f') + '33ab286a20242dda7743a900f369d68a')