diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2013-01-16 18:30:07 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-17 10:38:49 +0000 |
| commit | da9d37b6a115d9da04fa1b91c7effda5e6e454fe (patch) | |
| tree | 579279f13b2837e670d325bc258634a3025646d5 | |
| parent | 5b4cf2b15d5a62c8ce00284410a099239d6935d2 (diff) | |
| download | aports-da9d37b6a115d9da04fa1b91c7effda5e6e454fe.tar.bz2 aports-da9d37b6a115d9da04fa1b91c7effda5e6e454fe.tar.xz | |
xen: XSA-41
| -rw-r--r-- | main/xen/APKBUILD | 4 | ||||
| -rw-r--r-- | main/xen/xsa41.patch | 43 |
2 files changed, 46 insertions, 1 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 39033477e9..dbeee605ce 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xen pkgver=4.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Xen hypervisor" url="http://www.xen.org/" arch="x86 x86_64" @@ -23,6 +23,7 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g librt.patch busybox-sed.patch xsa33-4.1.patch + xsa41.patch xenstored.initd xenstored.confd @@ -123,6 +124,7 @@ b973dc1ffcc6872e222b36f3b7b4836b fix_bswap_blktap2.patch fa06495a175571f4aa3b6cb88937953e librt.patch 1bea3543ddc712330527b62fd9ff6520 busybox-sed.patch 25ba4efc5eee29daa12855fbadce84f8 xsa33-4.1.patch +ce56f00762139cd611dfc3332b7571cf xsa41.patch 6e5739dad7e2bd1b625e55ddc6c782b7 xenstored.initd b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd ed262f15fb880badb53575539468646c xenconsoled.initd diff --git a/main/xen/xsa41.patch b/main/xen/xsa41.patch new file mode 100644 index 0000000000..2c5b542d6b --- /dev/null +++ b/main/xen/xsa41.patch @@ -0,0 +1,43 @@ +From b0d9ffcd0251161c7c92f94804dcf599dfa3edeb Mon Sep 17 00:00:00 2001 +From: Michael Contreras <michael@inetric.com> +Date: Sun, 2 Dec 2012 20:11:22 -0800 +Subject: [PATCH] e1000: Discard packets that are too long if !SBP and !LPE + +The e1000_receive function for the e1000 needs to discard packets longer than +1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes +this behavior and allocates memory based on this assumption. + +Signed-off-by: Michael Contreras <michael@inetric.com> +Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> +--- +diff --git a/tools/ioemu-qemu-xen/hw/e1000.c b/tools/ioemu-qemu-xen/hw/e1000.c +index cb7e7e8..5537ad2 100644 +--- a/tools/ioemu-qemu-xen/hw/e1000.c ++++ b/tools/ioemu-qemu-xen/hw/e1000.c +@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); + #define PNPMMIO_SIZE 0x20000 + #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ + ++/* this is the size past which hardware will drop packets when setting LPE=0 */ ++#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 ++ + /* + * HW models: + * E1000_DEV_ID_82540EM works with Windows and Linux +@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) + size = sizeof(min_buf); + } + ++ /* Discard oversized packets if !LPE and !SBP. */ ++ if (size > MAXIMUM_ETHERNET_VLAN_SIZE ++ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) ++ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { ++ return size; ++ } ++ + if (!receive_filter(s, buf, size)) + return size; + +-- +1.7.0.4 + |