From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 3AB39C169C4 for ; Wed, 6 Feb 2019 16:43:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 062D120811 for ; Wed, 6 Feb 2019 16:43:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AHzmdV0H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731412AbfBFQn0 (ORCPT ); Wed, 6 Feb 2019 11:43:26 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40531 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730620AbfBFQn0 (ORCPT ); Wed, 6 Feb 2019 11:43:26 -0500 Received: by mail-pg1-f196.google.com with SMTP id z10so3123453pgp.7 for ; Wed, 06 Feb 2019 08:43:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=lmCpfUJZb+CVzPmUHf/JOe1LwefhPFziOFerTbA1h5E=; b=AHzmdV0HF9dSWhEXio1wln066imrvzfT1W0QNgMa2wK821FqhWsXBcPgJlTy038v3T 4T+/dBFDU2zW/RitmEeLEuwH4qsVFfaAOuLySXGkfw+pARKUPPRQ+gIBYjmLa4Jylt2x yYpQXQv2naorSMjQiQGVFkS6Vsw/KP4eYp1SUTchRjhSAlepN+/gIxFfrnEXlSuUbXtA 7Syr/SGLHYB5TjVit6Npa49SQuNW8Lwnn0zn8TR96TAM8WPtwEJujonHI0YuCrqNtS7a x7BfzRCXdru0n9v9F756VaK4hxUByCA/mFweqXfxQWfKIYOChPsAAqfXtvd4+OPgMlWE v9mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lmCpfUJZb+CVzPmUHf/JOe1LwefhPFziOFerTbA1h5E=; b=qOhfnbZOvUhjUEnkqO5knxCROYm8f964wWpen9g2azGGkcKNUpWJ8HsgS7c1qJEjiv 1b28O6HLal7vzJpjvV3xxI/7PzsAZn584N8ILfEScYkdkQfF4Be9Xa+fRyJwPg5qqk0P W/1hlyFM+5URrpgXdkvE8Okoi20UJhVZIwC+tjI97jF2dO5MwoCQRn1qqr8TVHnV29KL IOEXDih3Dl+A2AAs/xfmO0EZpHCuBiEZx4IRZJ6+aDnACX8UU2V01H01ustRdtgAyrlv KAD1HuGpcqHkUIPxiFZyUBdLFCvI6M618V/XrtUzh9LnTlGJY9crocskRmnDdGllPmeC kofQ== X-Gm-Message-State: AHQUAuZvDxNxDFiOXlTcSGVeEhtyTQi90pf8WuKKtMOvv5hllDjOCdt0 V4JVT7sTjPXVehCMwx9Y7Lk= X-Google-Smtp-Source: AHgI3IalaF2e+xYxxJeUy9bi2xIV1NHjucYkx3odwcKZP6ckCl4DOhQKNFXx/57G1GQW/q/gmV1tkQ== X-Received: by 2002:a62:3541:: with SMTP id c62mr11318322pfa.19.1549471405455; Wed, 06 Feb 2019 08:43:25 -0800 (PST) Received: from ?IPv6:2620:15c:2c1:200:55c7:81e6:c7d8:94b? ([2620:15c:2c1:200:55c7:81e6:c7d8:94b]) by smtp.gmail.com with ESMTPSA id f67sm19248726pff.29.2019.02.06.08.43.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 08:43:24 -0800 (PST) Subject: Re: [PATCH net 1/2] geneve: should not call rt6_lookup() when ipv6 was disabled To: Hangbin Liu , netdev@vger.kernel.org Cc: Stefano Brivio , David Miller References: <20190206125111.5286-1-liuhangbin@gmail.com> <20190206125111.5286-2-liuhangbin@gmail.com> From: Eric Dumazet Message-ID: Date: Wed, 6 Feb 2019 08:43:23 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190206125111.5286-2-liuhangbin@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 02/06/2019 04:51 AM, Hangbin Liu wrote: > When we add a new GENEVE device with IPv6 remote, checking only for > IS_ENABLED(CONFIG_IPV6) is not enough as we may disable IPv6 in kernel > cmd(ipv6.disable=1), which will cause a NULL pointer dereference. > > Reported-by: Jianlin Shi > Signed-off-by: Hangbin Liu > --- > drivers/net/geneve.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c > index 58bbba8582b0..0658715581e3 100644 > --- a/drivers/net/geneve.c > +++ b/drivers/net/geneve.c > @@ -1512,6 +1512,10 @@ static void geneve_link_config(struct net_device *dev, > } > #if IS_ENABLED(CONFIG_IPV6) > case AF_INET6: { > + struct inet6_dev *idev = in6_dev_get(dev); > + if (!idev) > + break; Do not mix declarations and code. Instead, use : struct inet6_dev *idev = in6_dev_get(dev); struct rt6_info *rt; if (!idev) break; rt = rt6_lookup(geneve->net, ...); > + > struct rt6_info *rt = rt6_lookup(geneve->net, > &info->key.u.ipv6.dst, NULL, 0, > NULL, 0); > @@ -1519,6 +1523,8 @@ static void geneve_link_config(struct net_device *dev, > if (rt && rt->dst.dev) > ldev_mtu = rt->dst.dev->mtu - GENEVE_IPV6_HLEN; > ip6_rt_put(rt); > + > + in6_dev_put(idev); > break; > } > #endif >