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 33153C169C4 for ; Wed, 6 Feb 2019 16:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF7172186A for ; Wed, 6 Feb 2019 16:45:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WDIxTLGc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731404AbfBFQp1 (ORCPT ); Wed, 6 Feb 2019 11:45:27 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:45952 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728748AbfBFQp0 (ORCPT ); Wed, 6 Feb 2019 11:45:26 -0500 Received: by mail-pl1-f194.google.com with SMTP id a14so3325001plm.12 for ; Wed, 06 Feb 2019 08:45:26 -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=wxdKENZgyzf0rclaDT4+fwzIF5xo5JnYocb7f8UAEvw=; b=WDIxTLGcFa291tlViGanN8fioMlMajvYHNQn6wooBTUtFpdfJMK/ODnYXh+1J60T1J iltvaxgiFmgD8seeL5GLHEKeEIU7vDPJJJWx/uGxHqk/jeO5s1HPesSuGTteVc0Wxnwd 6gMRngAmvbfsYwhZq30HgRAxSxY/3HioKclBUYpBWTsHWfT9V7/i1/ylpK1LXVV4oT7c gaMJJmuhr+4tlkIsYREoOEZcrLw6N1GujxAuZJAxxA1mQVcfYn/SAEO5B5ekrsXZezlD PcZ9IuwX8NY2EGiz0E5t/9GPNnlCzDPNzKhL+T/8j7Jk8C0eGX2q9Qq1oV7l92sxKRUN Fz4Q== 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=wxdKENZgyzf0rclaDT4+fwzIF5xo5JnYocb7f8UAEvw=; b=t0U/KUfJu1gmkiFQO9d8VE9ITTKskqhWWGGBQIPZA8R2BS3qYcdy3JdReysd+3cPDs 8YIhP0CJaqOpyYrTOGa/lPUr5mzeIRcb1R5fXLh2O8SKs+HvFuXaYS+Vnq5KWJbA3QpJ 4rcmoOf7WeWXxjSr2Z5/A3mJ+gezTAK+XxDRVPo/3IRtzNrNqVup5UvTpzSC3gmbWdRO 4kMhTh/khkHjeb3DLK84VUEFQLpdyOsgLWLCara//ZsCds7FO+XuayG3snSc0rZZphOa oIpyTwFVH3DhLzwaNHWRXeN9cjb015YosOAyCZO97M6cSWOFzfuA++xWi7MykpqRBW97 Pb6g== X-Gm-Message-State: AHQUAub5Gvqvx+N39NjxpkKmHrGU5+mL6taBb7cpn5Xm2VvGFHWJFfDo dkPfuA9J1k71kYFlbL623OQ= X-Google-Smtp-Source: AHgI3IYWs0xkXakGFvUT6gIxeruffD4U+XoCykTVujoGOcXEIZUtT+muepfwjNofYCF0jJr68uDgOw== X-Received: by 2002:a17:902:d01:: with SMTP id 1mr11743241plu.127.1549471526158; Wed, 06 Feb 2019 08:45:26 -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 c9sm16277655pfc.92.2019.02.06.08.45.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 08:45:25 -0800 (PST) Subject: Re: [PATCH net 2/2] sit: check if IPv6 enabled before call ip6_err_gen_icmpv6_unreach() To: Hangbin Liu , netdev@vger.kernel.org Cc: Stefano Brivio , David Miller References: <20190206125111.5286-1-liuhangbin@gmail.com> <20190206125111.5286-3-liuhangbin@gmail.com> From: Eric Dumazet Message-ID: Date: Wed, 6 Feb 2019 08:45:24 -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-3-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: > If we disabled IPv6 from kernel boot up cmd(ipv6.disable=1), we should not > call ip6_err_gen_icmpv6_unreach(). > > Reproducer: > ip link add sit1 type sit local 10.10.0.1 remote 10.10.1.1 ttl 1 > ip link set sit1 up > ip addr add 192.168.0.1/24 dev sit1 > ping 192.168.0.2 > > Reported-by: Jianlin Shi > Signed-off-by: Hangbin Liu > --- > net/ipv6/sit.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c > index 1e03305c0549..e43fbac0fd1a 100644 > --- a/net/ipv6/sit.c > +++ b/net/ipv6/sit.c > @@ -493,6 +493,7 @@ static int ipip6_err(struct sk_buff *skb, u32 info) > const int type = icmp_hdr(skb)->type; > const int code = icmp_hdr(skb)->code; > unsigned int data_len = 0; > + struct inet6_dev *idev; > struct ip_tunnel *t; > int sifindex; > int err; > @@ -546,8 +547,13 @@ static int ipip6_err(struct sk_buff *skb, u32 info) > } > > err = 0; > - if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len)) > + > + idev = in6_dev_get(skb->dev); > + if (idev && > + !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len)) { > + in6_dev_put(idev); > goto out; > + } > It seems there is a missing in6_dev_put(idev) depending on ip6_err_gen_icmpv6_unreach()() return value ?