From nobody Wed Sep 17 13:55:35 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ADC5C4332F for ; Mon, 19 Dec 2022 01:07:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231185AbiLSBGl (ORCPT ); Sun, 18 Dec 2022 20:06:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230386AbiLSBGa (ORCPT ); Sun, 18 Dec 2022 20:06:30 -0500 Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBE2325FD for ; Sun, 18 Dec 2022 17:06:26 -0800 (PST) Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id A7BDF2C04D0; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1671411983; bh=b5Vys3RZgCf8hr5WBLGbUPkgO7Lub5HlKnK0lTDDKWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0L1vTGFFuihgrO6xhxMMXJ7EUjDQ83q/nTBjGwXrtFUltOJaTr1UFSenijUDqNkUj uVnDHQD/LoSIGZRs6FVw2AVCiO+Pf/ZruV/qjiwHMK1OpiOXAR1bfR0+7ejoDkv5AF YzL8DSEN2v46HKMkwx412UCuvsGAfnp1evZQUw200Canu+IGST3JRapGzy6MlfNW5r iQqLXEnTecLDcikYYsBhJj5HnIWZuvifUR2XlZ0HT6K/CspLpoaZKs2Gh+H5VhqdtI zo/fp2eZ7ORVVevBKkaz+lz2HV7rICW2Hlb9TOrtFuH2xR0sIBNdWD6zhWxuHiuUkI I7bYktqed1ikg== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Mon, 19 Dec 2022 14:06:23 +1300 Received: from thomaswi-dl.ws.atlnz.lc (thomaswi-dl.ws.atlnz.lc [10.33.25.46]) by pat.atlnz.lc (Postfix) with ESMTP id 69BFF13EE7B; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 68AE73E512F; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH 1/2] ip/ip6_gre: Fix changing addr gen mode not generating IPv6 link local address Date: Mon, 19 Dec 2022 14:06:18 +1300 Message-Id: <20221219010619.1826599-2-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221219010619.1826599-1-Thomas.Winter@alliedtelesis.co.nz> References: <20221219010619.1826599-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=X/cs11be c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=sHyYjHe8cH0A:10 a=sxvoXph97cTEOaL2aYsA:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit e5dd729460ca changed the code path so that GRE tunnels generate an IPv6 address based on the tunnel source address. It also changed the code path so GRE tunnels don't call addrconf_addr_gen in addrconf_dev_config which is called by addrconf_sysctl_addr_gen_mode when the IN6_ADDR_GEN_MODE is changed. This patch aims to fix this issue by moving the code in addrconf_notify which calls the addr gen for GRE and SIT into a separate function and calling it in the places that expect the IPv6 address to be generated. The previous addrconf_dev_config is renamed to addrconf_eth_config since it only expected eth type interfaces and follows the addrconf_gre/sit_config format. Fixes: e5dd729460ca ("ip/ip6_gre: use the same logic as SIT interfaces when= computing v6LL address") Signed-off-by: Thomas Winter --- net/ipv6/addrconf.c | 47 +++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 6dcf034835ec..e9d7ec03316d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3355,7 +3355,7 @@ static void addrconf_addr_gen(struct inet6_dev *idev,= bool prefix_route) } } =20 -static void addrconf_dev_config(struct net_device *dev) +static void addrconf_eth_config(struct net_device *dev) { struct inet6_dev *idev; =20 @@ -3447,6 +3447,30 @@ static void addrconf_gre_config(struct net_device *d= ev) } #endif =20 +static void addrconf_dev_config(struct net_device *dev) +{ + switch (dev->type) { +#if IS_ENABLED(CONFIG_IPV6_SIT) + case ARPHRD_SIT: + addrconf_sit_config(dev); + break; +#endif +#if IS_ENABLED(CONFIG_NET_IPGRE) || IS_ENABLED(CONFIG_IPV6_GRE) + case ARPHRD_IP6GRE: + case ARPHRD_IPGRE: + addrconf_gre_config(dev); + break; +#endif + case ARPHRD_LOOPBACK: + init_loopback(dev); + break; + + default: + addrconf_eth_config(dev); + break; + } +} + static int fixup_permanent_addr(struct net *net, struct inet6_dev *idev, struct inet6_ifaddr *ifp) @@ -3611,26 +3635,7 @@ static int addrconf_notify(struct notifier_block *th= is, unsigned long event, run_pending =3D 1; } =20 - switch (dev->type) { -#if IS_ENABLED(CONFIG_IPV6_SIT) - case ARPHRD_SIT: - addrconf_sit_config(dev); - break; -#endif -#if IS_ENABLED(CONFIG_NET_IPGRE) || IS_ENABLED(CONFIG_IPV6_GRE) - case ARPHRD_IP6GRE: - case ARPHRD_IPGRE: - addrconf_gre_config(dev); - break; -#endif - case ARPHRD_LOOPBACK: - init_loopback(dev); - break; - - default: - addrconf_dev_config(dev); - break; - } + addrconf_dev_config(dev); =20 if (!IS_ERR_OR_NULL(idev)) { if (run_pending) --=20 2.37.3 From nobody Wed Sep 17 13:55:35 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EE11C46467 for ; Mon, 19 Dec 2022 01:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231174AbiLSBGg (ORCPT ); Sun, 18 Dec 2022 20:06:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229730AbiLSBGa (ORCPT ); Sun, 18 Dec 2022 20:06:30 -0500 Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD7C725E0 for ; Sun, 18 Dec 2022 17:06:26 -0800 (PST) Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id B22442C04E6; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1671411983; bh=SmxTgPqi/CiMEf055mHB+0SxdnvM1wex2CECQqt0cy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RwgKlV3dVwE2/tn/8zvjHH8KEgZ3cInmlByVG9a1PyGLUjetXNtQMy5cam4dGsGWV zYXUTZDarH4jPXF4iIfhX8Nfr0u12Q25FELZV0IwfZpMdCEZRj6a5WF5v+VoGzq/3H stvzTJjekwgf8V4a6UvMNDXUNCFhorJJpN+nmx/2uJR+u1AQ0ZC5V9RIQ8p/+EM33Q ln47f/3j51wDTlFDxtTZNDuV9YULZqNDQhIlZ4LXDfS5cd27gZt5BHBMBp2269cOS7 6wsvcMqfEjcF+ZXj4xhHY5e5cgSQP4qfW68II/Wm4uOoSigkwL3/NiAuBnA5iwkdcX zLd9foDqVmGIA== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Mon, 19 Dec 2022 14:06:23 +1300 Received: from thomaswi-dl.ws.atlnz.lc (thomaswi-dl.ws.atlnz.lc [10.33.25.46]) by pat.atlnz.lc (Postfix) with ESMTP id 6AD6B13EE82; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 6ACC73E5133; Mon, 19 Dec 2022 14:06:23 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH 2/2] ip/ip6_gre: Fix non-point-to-point tunnel not generating IPv6 link local address Date: Mon, 19 Dec 2022 14:06:19 +1300 Message-Id: <20221219010619.1826599-3-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221219010619.1826599-1-Thomas.Winter@alliedtelesis.co.nz> References: <20221219010619.1826599-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=X/cs11be c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=sHyYjHe8cH0A:10 a=Bk4KLNytfi6p_AlvEHIA:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Previously, addrconf_gre_config always would call addrconf_addr_gen and generate a EUI64 link local address for the tunnel. Then commit e5dd729460ca changed the code path so that add_v4_addrs is called but this only generates a compat IPv6 address for non-point-to-point tunnels. I assume the compat address is specifically for SIT tunnels so have kept that only for SIT - GRE tunnels now always generate link local addresses. Fixes: e5dd729460ca ("ip/ip6_gre: use the same logic as SIT interfaces when= computing v6LL address") Signed-off-by: Thomas Winter --- net/ipv6/addrconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e9d7ec03316d..a51fb106fa4a 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3129,17 +3129,17 @@ static void add_v4_addrs(struct inet6_dev *idev) offset =3D sizeof(struct in6_addr) - 4; memcpy(&addr.s6_addr32[3], idev->dev->dev_addr + offset, 4); =20 - if (idev->dev->flags&IFF_POINTOPOINT) { + if (!(idev->dev->flags & IFF_POINTOPOINT) && idev->dev->type =3D=3D ARPHR= D_SIT) { + scope =3D IPV6_ADDR_COMPATv4; + plen =3D 96; + pflags |=3D RTF_NONEXTHOP; + } else { if (idev->cnf.addr_gen_mode =3D=3D IN6_ADDR_GEN_MODE_NONE) return; =20 addr.s6_addr32[0] =3D htonl(0xfe800000); scope =3D IFA_LINK; plen =3D 64; - } else { - scope =3D IPV6_ADDR_COMPATv4; - plen =3D 96; - pflags |=3D RTF_NONEXTHOP; } =20 if (addr.s6_addr32[3]) { --=20 2.37.3