diff options
| author | Michael Contreras <michael@inetric.com> | 2012-12-02 20:11:22 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-03 08:14:10 -0600 |
| commit | b0d9ffcd0251161c7c92f94804dcf599dfa3edeb (patch) | |
| tree | 6081c6f2c86125234555973f643fce06a932f127 | |
| parent | 01bbd8bf2caced5cb07939669f58d3a7bcc78092 (diff) | |
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>
| -rw-r--r-- | hw/e1000.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index cb7e7e8366..5537ad2fc4 100644 --- a/hw/e1000.c +++ b/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; |