Skip to contentSkip to conversation

net: sh_eth: fix skb_over_panic happen

PATCH Applied Shimoda, Yoshihiro 2 participants 2 messages Feb 7, 2012

Subsystems (3)
Networking Network drivers Renesas SuperH Ethernet driver
lore
Share & tools
lore

Shimoda, Yoshihiro

author
#0 lore raw

PATCH v2 1/1 net: sh_eth: fix skb_over_panic happen

When this GETHER controller received a large frame (about 1800 bytes or more), skb_over_panic() happened. This is because the previous driver set the RFLR to 0x1000 (4096 bytes) and the skb allocate size is smaller than 4096 bytes. So, the controller accepted such a frame.

The controller can discard a large frame by the RFLR setting. So, the patch modifies the value of RFLR to mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN.

Signed-off-by Yoshihiro Shimoda <[email protected]>
Cc Eric Dumazet <[email protected]>

---
about v2:
- add VLAN_HLEN to the value of RFLR.

 drivers/net/ethernet/renesas/sh_eth.c |    4 +++-
 drivers/net/ethernet/renesas/sh_eth.h |    3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/renesas/sh_eth.c +3 -1
index 0887d17..698b080 100644
@@ -38,6 +38,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/ethtool.h>
+#include <linux/if_vlan.h>
 #include <linux/sh_eth.h>
 
 #include "sh_eth.h"

@@ -817,7 +818,8 @@ static int sh_eth_dev_init(struct net_device *ndev)
 		sh_eth_write(ndev, 0, TRIMD);
 
 	/* Recv frame limit set register */
-	sh_eth_write(ndev, RFLR_VALUE, RFLR);
+	sh_eth_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN,
+		     RFLR);
 
 	sh_eth_write(ndev, sh_eth_read(ndev, EESR), EESR);
 	sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
drivers/net/ethernet/renesas/sh_eth.h +0 -3
index ba72976..cb07add 100644
@@ -575,9 +575,6 @@ enum RPADIR_BIT {
 	RPADIR_PADR = 0x0003f,
 };
 
-/* RFLR */
-#define RFLR_VALUE 0x1000
-
 /* FDR */
 #define DEFAULT_FDR_INIT	0x00000707
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: "Shimoda, Yoshihiro" <[email protected]>
Date: Tue, 07 Feb 2012 18:55:15 +0900

Quoted 11 lines

When this GETHER controller received a large frame (about 1800 bytes or more), skb_over_panic() happened. This is because the previous driver set the RFLR to 0x1000 (4096 bytes) and the skb allocate size is smaller than 4096 bytes. So, the controller accepted such a frame.

The controller can discard a large frame by the RFLR setting. So, the patch modifies the value of RFLR to mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN.

Signed-off-by Yoshihiro Shimoda <[email protected]>
Cc Eric Dumazet <[email protected]>

Applied, thanks.