From patchwork Thu Jun 15 16:37:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haishuang Yan X-Patchwork-Id: 776373 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 3wpThr4y0kz9s5L for ; Fri, 16 Jun 2017 02:38:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbdFOQiV (ORCPT ); Thu, 15 Jun 2017 12:38:21 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:30252 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbdFOQiU (ORCPT ); Thu, 15 Jun 2017 12:38:20 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.17]) by rmmx-syy-dmz-app08-12008 (RichMail) with SMTP id 2ee85942b7f31b5-31805; Fri, 16 Jun 2017 00:38:12 +0800 (CST) X-RM-TRANSID: 2ee85942b7f31b5-31805 X-RM-SPAM-FLAG: 00000000 Received: from localhost (unknown[223.105.0.240]) by rmsmtp-syy-appsvr09-12009 (RichMail) with SMTP id 2ee95942b7f3b61-67e8f; Fri, 16 Jun 2017 00:38:11 +0800 (CST) X-RM-TRANSID: 2ee95942b7f3b61-67e8f From: Haishuang Yan To: "David S. Miller" , Paolo Abeni , Alexei Starovoitov Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan Subject: [PATCH 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode Date: Fri, 16 Jun 2017 00:37:56 +0800 Message-Id: <1497544676-314-2-git-send-email-yanhaishuang@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497544676-314-1-git-send-email-yanhaishuang@cmss.chinamobile.com> References: <1497544676-314-1-git-send-email-yanhaishuang@cmss.chinamobile.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In collect_md mode, if the tun dev is down, it still can call __ip6_tnl_rcv to receive on packets, and the rx statistics increase improperly. Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels") Cc: Alexei Starovoitov Signed-off-by: Haishuang Yan --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 6400726..25961c7 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -171,7 +171,7 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev) } t = rcu_dereference(ip6n->collect_md_tun); - if (t) + if (t && (t->dev->flags & IFF_UP)) return t; t = rcu_dereference(ip6n->tnls_wc[0]);