From patchwork Thu Jun 15 16:37:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haishuang Yan X-Patchwork-Id: 776374 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 3wpTjV0KDbz9s71 for ; Fri, 16 Jun 2017 02:39:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752476AbdFOQi6 (ORCPT ); Thu, 15 Jun 2017 12:38:58 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:30251 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752094AbdFOQiN (ORCPT ); Thu, 15 Jun 2017 12:38:13 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app08-12008 (RichMail) with SMTP id 2ee85942b7ed1af-317ff; Fri, 16 Jun 2017 00:38:05 +0800 (CST) X-RM-TRANSID: 2ee85942b7ed1af-317ff X-RM-SPAM-FLAG: 00000000 Received: from localhost (unknown[223.105.0.240]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75942b7ecd5a-ff30f; Fri, 16 Jun 2017 00:38:04 +0800 (CST) X-RM-TRANSID: 2ee75942b7ecd5a-ff30f From: Haishuang Yan To: "David S. Miller" , Paolo Abeni , Alexei Starovoitov Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan , Pravin B Shelar Subject: [PATCH 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode Date: Fri, 16 Jun 2017 00:37:55 +0800 Message-Id: <1497544676-314-1-git-send-email-yanhaishuang@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 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 ip_tunnel_rcv to receive on packets, and the rx statistics increase improperly. Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.") Cc: Pravin B Shelar Signed-off-by: Haishuang Yan --- net/ipv4/ip_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 0f1d876..a3caba1 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -176,7 +176,7 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn, return cand; t = rcu_dereference(itn->collect_md_tun); - if (t) + if (t && (t->dev->flags & IFF_UP)) return t; if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags & IFF_UP)