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=-8.9 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,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 E2716C43381 for ; Mon, 25 Feb 2019 04:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A55602087C for ; Mon, 25 Feb 2019 04:13:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NSGTRdj3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728424AbfBYENC (ORCPT ); Sun, 24 Feb 2019 23:13:02 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42252 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726755AbfBYENC (ORCPT ); Sun, 24 Feb 2019 23:13:02 -0500 Received: by mail-pf1-f195.google.com with SMTP id n74so3831569pfi.9 for ; Sun, 24 Feb 2019 20:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6gA7Po3JdTPhPsXqqRB0n2xxjcYmZWhgs3gJOTenkJs=; b=NSGTRdj3abqLcRov/4AOiqIrpHwaQ/AOPXnyCIS1Qvyw7TpegME6ONZvdRf++Dg8JG DC+rKIeePuCtfXK9YCtbf8khdr+qif3k6WuqVMrCyiOydzgcN/6sXnHXVYdqqaJGseIQ jXzEYN7pG/EqG8MlhRuh3/NWrZvT8oyQbOyjL/Pzl9xEzLfybgOCkCKFtwEeNqKD8JQc ShthW8C8D5pd9zuym5MsnjJ93b618Nl6Kx+sOKUJ2esuSKHNfg0bNa6m4Aor4uTCycid fS97cfaPvI+u5AGW4hASaus+IJE6vtfdhxj2WXyRK/XldIkyCTkFURaO+MzNL5qSUybf AGLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6gA7Po3JdTPhPsXqqRB0n2xxjcYmZWhgs3gJOTenkJs=; b=sHMRFvf8VKSLTAcd7QVuozCL62hJqC6Hc2+L4PSa6ROl6vy2iPl/0PCMo3DEo+Wml2 gWe2SoGl9Avtuqmxfs4LEk1AEa5Rg2w8hesTI36G8RHeIh3+ECAwqM2soiNFxo6z7s/Y bQqnN9PqlzTcw28DTwiDOi9fgPGmGE3TwH2Tik3LoRCJqgCNyYSO4KqTgAYu+0fzXqB+ k5ASO/brpYNOUGyxOBbQELF0MEgb0vRadycrs/Wb3HLZMnxDc25EDLZWA4BUn+nxLxc+ ljIRaSJ4urBBJkE43nG2kyfbeZXdtXc6kgk1bVz7801AOb2RhuLTMHJREljUCCdoVzlN tDkg== X-Gm-Message-State: AHQUAuY3+c+cdJgUWhQGdUENi5TCT0fefqV3xk4u1Mdl1bJVcgwVfMYH KWJSnz/VjdA55fUAzpo56IU0KTXSiB4= X-Google-Smtp-Source: AHgI3IZWQjqYur4qBm8PhuPVxJ35GMvfpypNOcbnWG5A5u6ZvXu8jS1BKwVHgAQOxItxaGl2yb4c9Q== X-Received: by 2002:a62:2ad1:: with SMTP id q200mr17949281pfq.34.1551067981124; Sun, 24 Feb 2019 20:13:01 -0800 (PST) Received: from dhcp-12-139.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d16sm10561503pfo.112.2019.02.24.20.12.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Feb 2019 20:13:00 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Stefano Brivio , "David S . Miller" , David Ahern , Hangbin Liu Subject: [PATCH net] sit: use ipv6_mod_enabled to check if ipv6 is disabled Date: Mon, 25 Feb 2019 12:12:43 +0800 Message-Id: <20190225041243.9753-1-liuhangbin@gmail.com> X-Mailer: git-send-email 2.19.2 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 ipv6_mod_enabled() is more safe and gentle to check if ipv6 is disabled at running time. Fixes: 173656accaf5 ("sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()") Signed-off-by: Hangbin Liu --- net/ipv6/sit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e8a1dabef803..eea1f19985a7 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -546,7 +546,7 @@ static int ipip6_err(struct sk_buff *skb, u32 info) } err = 0; - if (__in6_dev_get(skb->dev) && + if (ipv6_mod_enabled() && !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4, type, data_len)) goto out; -- 2.19.2