[PATCH] vlan: fix vlan_skb_recv()

From: Eric Dumazet
Date: Sun Jan 24 2010 - 14:43:23 EST

Le 24/01/2010 20:18, Bruno PrÃmont a Ãcrit :
> Yep, works fine and RX stats look right as well.
> So
> Reported-By: Bruno PrÃmont <bonbons@xxxxxxxxxxxxxxxxx>
> Tested-By: Bruno PrÃmont <bonbons@xxxxxxxxxxxxxxxxx>
> Thanks,

Thanks very much Bruno, here is the official patch submission then.

[PATCH] vlan: fix vlan_skb_recv()

Bruno PrÃmont found commit 9793241fe92f7d930
(vlan: Precise RX stats accounting) added a regression for non
hw accelerated vlans.

[ 26.390576] BUG: unable to handle kernel NULL pointer dereference at (null)
[ 26.396369] IP: [<df856b89>] vlan_skb_recv+0x89/0x280 [8021q]

vlan_dev_info() was used with original device, instead of
skb->dev. Also spotted by AmÃrico Wang.

Reported-By: Bruno PrÃmont <bonbons@xxxxxxxxxxxxxxxxx>
Tested-By: Bruno PrÃmont <bonbons@xxxxxxxxxxxxxxxxx>
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
net/8021q/vlan_dev.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b788978..c1b92ca 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -163,7 +163,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
goto err_unlock;

- rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
+ rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
rx_stats->rx_bytes += skb->len;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/