mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-02-13 11:51:38 +01:00
72b0ec4675
Some patches where not included in the original XSA, this are the remaining ones (so far). To be applied to edge and 2.5
68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
From 70454385eeee6f0b3f7a9eddca9f7340b5060824 Mon Sep 17 00:00:00 2001
|
|
From: Michael Contreras <michael@inetric.com>
|
|
Date: Thu, 17 Jan 2013 11:49:37 +0000
|
|
Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
|
|
|
|
Discard packets longer than 16384 when !SBP to match the hardware behavior.
|
|
|
|
upstream-commit-id: 2c0331f4f7d241995452b99afaf0aab00493334a
|
|
security-tags: XSA-41, CVE-2012-6075
|
|
This is the second of two security fixes for XSA-41.
|
|
|
|
Signed-off-by: Michael Contreras <michael@inetric.com>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
---
|
|
diff --git a/tools/qemu-xen/hw/e1000.c b/tools/qemu-xen/hw/e1000.c
|
|
index 37d207e..a5e67a8 100644
|
|
--- a/tools/qemu-xen/hw/e1000.c
|
|
+++ b/tools/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:
|
|
@@ -697,8 +699,9 @@ e1000_receive(VLANClientState *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/tools/qemu-xen-traditional/hw/e1000.c b/tools/qemu-xen-traditional/hw/e1000.c
|
|
index 37d207e..a5e67a8 100644
|
|
--- a/tools/qemu-xen-traditional/hw/e1000.c
|
|
+++ b/tools/qemu-xen-traditional/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:
|
|
@@ -697,8 +699,9 @@ e1000_receive(VLANClientState *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.2.5
|
|
|