diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-01-25 04:52:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-25 04:52:24 +0100 |
| commit | 2dc85e91d05be91343033df78e4e6d99dc7ea50e (patch) | |
| tree | 64d63c2cd1cf0ee6f768261f5992010d0110bde6 /net | |
| parent | netns xfrm: fix "ip xfrm state|policy count" misreport (diff) | |
| download | linux-2dc85e91d05be91343033df78e4e6d99dc7ea50e.tar.xz linux-2dc85e91d05be91343033df78e4e6d99dc7ea50e.zip | |
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@linux-vserver.org>
Tested-By: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b7889782047e..c1b92cab46c7 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, smp_processor_id()); rx_stats->rx_packets++; rx_stats->rx_bytes += skb->len; |