From patchwork Sun Jan 24 19:43:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 43601 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 70BE7B7CA6 for ; Mon, 25 Jan 2010 06:43:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369Ab0AXTnO (ORCPT ); Sun, 24 Jan 2010 14:43:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752719Ab0AXTnN (ORCPT ); Sun, 24 Jan 2010 14:43:13 -0500 Received: from gw1.cosmosbay.com ([212.99.114.194]:49729 "EHLO gw1.cosmosbay.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752593Ab0AXTnN (ORCPT ); Sun, 24 Jan 2010 14:43:13 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by gw1.cosmosbay.com (8.13.7/8.13.7) with ESMTP id o0OJh6aB028694; Sun, 24 Jan 2010 20:43:07 +0100 Message-ID: <4B5CA2CA.4040307@gmail.com> Date: Sun, 24 Jan 2010 20:43:06 +0100 From: Eric Dumazet User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; fr; rv:1.9.1.7) Gecko/20100111 Thunderbird/3.0.1 MIME-Version: 1.0 To: =?UTF-8?B?QnJ1bm8gUHLDqW1vbnQ=?= , "David S. Miller" CC: =?UTF-8?B?QW3DqXJpY28gV2FuZw==?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] vlan: fix vlan_skb_recv() References: <20100123165657.187c11e4@neptune.home> <20100123223132.0e62d8cb@neptune.home> <4B5C4E5E.2010507@gmail.com> <20100124160228.366f4e72@neptune.home> <20100124162549.2b39b222@neptune.home> <4B5C74BF.5060604@gmail.com> <20100124201808.2bbbf0b0@neptune.home> In-Reply-To: <20100124201808.2bbbf0b0@neptune.home> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6 (gw1.cosmosbay.com [0.0.0.0]); Sun, 24 Jan 2010 20:43:08 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 > Tested-By: Bruno Prémont > > 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: [] 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 Tested-By: Bruno Prémont Signed-off-by: Eric Dumazet --- net/8021q/vlan_dev.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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, smp_processor_id()); rx_stats->rx_packets++; rx_stats->rx_bytes += skb->len;