fix DSA-2608-1

bump version to 1.3-13

diff --git a/Makefile b/Makefile
index 94e4cd8a7d8513d9b551a0a39bcb489bab18d2f6..ac518eb167b17a8ecd04c95da589efe69d9e5eb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 # also update debian/changelog
 KVMVER=1.3
-KVMPKGREL=12
+KVMPKGREL=13
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

diff --git a/debian/changelog b/debian/changelog
index 9e412b443b229294f8d23de4125119e410dd5885..def4dc04e181ac971bd9330c563526b78ec423ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pve-qemu-kvm (1.3-13) unstable; urgency=low
+
+  * fix DSA-2608-1 qemu -- buffer overflow (see 
+  http://www.debian.org/security/2013/dsa-2608)
+  
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 17 Jan 2013 06:58:47 +0100
+
 pve-qemu-kvm (1.3-12) unstable; urgency=low
 
   * update vma patches

diff --git a/debian/patches/e1000-discard-oversized-packets.patch b/debian/patches/e1000-discard-oversized-packets.patch
new file mode 100644 (file)
index 0000000..f200845
--- /dev/null
+++ b/debian/patches/e1000-discard-oversized-packets.patch
@@ -0,0 +1,38 @@
+From 2c0331f4f7d241995452b99afaf0aab00493334a Mon Sep 17 00:00:00 2001
+From: Michael Contreras <michael@inetric.com>
+Date: Wed, 5 Dec 2012 13:31:30 -0500
+Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
+
+Discard packets longer than 16384 when !SBP to match the hardware behavior.
+
+Signed-off-by: Michael Contreras <michael@inetric.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ hw/e1000.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hw/e1000.c b/hw/e1000.c
+index 92fb00a..8fd1654 100644
+--- a/hw/e1000.c
++++ b/hw/e1000.c
+@@ -61,6 +61,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
+ 
+ /* this is the size past which hardware will drop packets when setting LPE=0 */
+ #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
++/* this is the size past which hardware will drop packets when setting LPE=1 */
++#define MAXIMUM_ETHERNET_LPE_SIZE 16384
+ 
+ /*
+  * HW models:
+@@ -809,8 +811,9 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size)
+     }
+ 
+     /* Discard oversized packets if !LPE and !SBP. */
+-    if (size > MAXIMUM_ETHERNET_VLAN_SIZE
+-        && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
++    if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
++        (size > MAXIMUM_ETHERNET_VLAN_SIZE
++        && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
+         && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
+         return size;
+     }

diff --git a/debian/patches/series b/debian/patches/series
index 18243d809807f5a184711a2cfb119b4b22a1716b..9809e7c623e89a4d401505ff06bf6be5bb15c035 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,5 @@ virtio-balloon-re-enable-balloon-stats.patch
 virtio-balloon-document-stats.patch
 virtio-balloon-fix-query.patch
 always-update-expected-downtime.patch
+e1000-discard-oversized-packets.patch
+