Update e1000e driver to not allow dma beyond the end of the allocated skb
Signed-off-by: Neil Horman <[email protected]>
netdev.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c3105c5..370bb0f 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2276,6 +2276,20 @@ static void e1000_configure_tx(struct e1000_adapter
*adapter)
adapter->tx_queue_len = adapter->netdev->tx_queue_len;
}
+
+static inline u32 normalize_rx_len(u32 len)
+{
+ u32 match, last_match;
+
+
+ for (match = 0x100; match <= 0x4000; match *= 2) {
+ if (len <= match)
+ return match;
+ }
+
+ return 0;
+}
+
/**
* e1000_setup_rctl - configure the receive control registers
* @adapter: Board private structure
@@ -2288,6 +2302,7 @@ static void e1000_setup_rctl(struct e1000_adapter
*adapter)
u32 rctl, rfctl;
u32 psrctl = 0;
u32 pages = 0;
+ u32 normed_rx_length;
/* Program MC offset vector base */
rctl = er32(RCTL);
@@ -2332,7 +2347,28 @@ static void e1000_setup_rctl(struct e1000_adapter
*adapter)
/* Setup buffer sizes */
rctl &= ~E1000_RCTL_SZ_4096;
rctl |= E1000_RCTL_BSEX;
- switch (adapter->rx_buffer_len) {
+ /*
+ * We need to normalize the rx_buffer_len here
+ * since the hardware only knows about 7 discrete
+ * frame lengths here. To accomodate that we need
+ * to set the rx length in the hardware to the next highest
+ * size over the rx_buffer_len, then increase rx_buffer_len
+ * to match it, so that we can get a full mtu sized frame
+ */
+ normed_rx_length = normalize_rx_len(adapter->rx_buffer_len);
+
+ if (!normed_rx_length) {
+ printk(KERN_ERR "No valid rx len found, assume 2048\n");
+ normed_rx_length = 0x800;
+ }
+
+ /*
+ * Now we need to bump the rx_len value up so that we allocate
+ * enough data for us to dma into
+ */
+ adapter->rx_buffer_len = normed_rx_length;
+
+ switch (normed_rx_length) {
case 256:
rctl |= E1000_RCTL_SZ_256;
rctl &= ~E1000_RCTL_BSEX;
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
