Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D831BC43381 for ; Wed, 6 Mar 2019 10:38:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E45920661 for ; Wed, 6 Mar 2019 10:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729385AbfCFKin (ORCPT ); Wed, 6 Mar 2019 05:38:43 -0500 Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:50805 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727367AbfCFKin (ORCPT ); Wed, 6 Mar 2019 05:38:43 -0500 X-Greylist: delayed 355 seconds by postgrey-1.27 at vger.kernel.org; Wed, 06 Mar 2019 05:38:42 EST Received: from bretzel.dev.6wind.com (unknown [10.16.0.19]) by proxy.6wind.com (Postfix) with ESMTPS id 18F0D275CD7; Wed, 6 Mar 2019 11:32:45 +0100 (CET) Received: from dichtel by bretzel.dev.6wind.com with local (Exim 4.89) (envelope-from ) id 1h1Tqq-0005kA-Iv; Wed, 06 Mar 2019 11:32:41 +0100 From: Nicolas Dichtel To: davem@davemloft.net Cc: netdev@vger.kernel.org, Nicolas Dichtel , wenxu Subject: [PATCH net] gre: fix kernel panic when using lw tunnel Date: Wed, 6 Mar 2019 11:32:27 +0100 Message-Id: <20190306103227.21279-1-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There was several problems: - skb_dst(skb) can be NULL when the packet comes from a gretap tunnel; - skb_dst(skb)->ops may point to md_dst_ops, which doesn't set ->mtu handler, thus calling dst_mtu() leads to a panic. I also wonder if ->cow_metrics may be called if skb_dst(skb)->ops points to ovs_dst_ops. Don't try to do anything in one of those cases. Fixes: 962924fa2b7a ("ip_gre: Refactor collect metatdata mode tunnel xmit to ip_md_tunnel_xmit") CC: wenxu Signed-off-by: Nicolas Dichtel --- net/ipv4/ip_tunnel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 2756fb725bf0..e2e0e4601c0f 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -508,6 +508,12 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb, int pkt_size; int mtu; + if (!skb_dst(skb) || + !skb_dst(skb)->ops->mtu || + (dst_metrics_read_only(skb_dst(skb)) && + !skb_dst(skb)->ops->cow_metrics)) + return 0; + tunnel_hlen = md ? tunnel_hlen : tunnel->hlen; pkt_size = skb->len - tunnel_hlen - dev->hard_header_len; -- 2.21.0