diff options
Diffstat (limited to 'utils/xen/xsa-41-1.patch')
| -rw-r--r-- | utils/xen/xsa-41-1.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/utils/xen/xsa-41-1.patch b/utils/xen/xsa-41-1.patch new file mode 100644 index 0000000000..4ca750b421 --- /dev/null +++ b/utils/xen/xsa-41-1.patch @@ -0,0 +1,41 @@ +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/tools/ioemu-qemu-xen/hw/e1000.c ++++ b/tools/ioemu-qemu-xen/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; + } +-- +1.7.0.4 + |