Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbdFOQi7 (ORCPT ); Thu, 15 Jun 2017 12:38:59 -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 X-RM-TRANSID: 2ee85942b7ed1af-317ff X-RM-SPAM-FLAG: 00000000 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 826 Lines: 28 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) -- 1.8.3.1