From nobody Sun Sep 14 09:42:05 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 A8CEFC25B50 for ; Tue, 24 Jan 2023 03:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232312AbjAXDVY (ORCPT ); Mon, 23 Jan 2023 22:21:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231828AbjAXDVW (ORCPT ); Mon, 23 Jan 2023 22:21:22 -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 8842D37B72 for ; Mon, 23 Jan 2023 19:21:20 -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 3FD352C0382; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674530477; bh=ui64NQiE46HAaxcvftxz384jJGVakZIhHVS3AZGc4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKrVyFMKiLHSGDgVmKps7Ed+tbM8w9ygC8pkW/peOj7w4Z2n2/GP1VVgIXg6Q++wH BcVQqYNSIdBhKECmmH9Ry6Qe58QMNm6SHdzupq6HhrlQ6lZ0jYZzMHzZjjVUZvD6VX 2+wFXkUyYaWPKwdQnrpLJizmb/LiCKiZlGHo1Bm4anO7M9G1Srr1+5mOfW4f2o5NUi H9sZ6FE1QM8fvcawJ5lBlY4F76Pkx3gFy2FORmwFDLa0it/IJ4qIdfExPqNMr/dxwd DFKpLXYaY8KJHA7OicJoxMm6ZLbal8vPMv73PuYwmmu04BqtJfd4jnlvM/0/LwDIhw VwMlpeLiKOJnw== 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 ; Tue, 24 Jan 2023 16:21:17 +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 0624313EDFA; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 01D953E079C; Tue, 24 Jan 2023 16:21:16 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, 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: Tue, 24 Jan 2023 16:21:02 +1300 Message-Id: <20230124032105.79487-2-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA:10 a=HROInG98OEpMAGfJxuYA: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 | 51 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index f7a84a4acffc..0065b38fc85b 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 addrconfig_init_auto_addrs(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) @@ -3615,26 +3639,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; - } + addrconfig_init_auto_addrs(dev); =20 if (!IS_ERR_OR_NULL(idev)) { if (run_pending) @@ -6397,7 +6402,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_t= able *ctl, int write, =20 if (idev->cnf.addr_gen_mode !=3D new_val) { idev->cnf.addr_gen_mode =3D new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } else if (&net->ipv6.devconf_all->addr_gen_mode =3D=3D ctl->data) { struct net_device *dev; @@ -6408,7 +6413,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_t= able *ctl, int write, if (idev && idev->cnf.addr_gen_mode !=3D new_val) { idev->cnf.addr_gen_mode =3D new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } } --=20 2.39.0 From nobody Sun Sep 14 09:42:05 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 8713BC54E94 for ; Tue, 24 Jan 2023 03:21:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232732AbjAXDVc (ORCPT ); Mon, 23 Jan 2023 22:21:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231936AbjAXDVX (ORCPT ); Mon, 23 Jan 2023 22:21:23 -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 DDA9836FF7 for ; Mon, 23 Jan 2023 19:21:21 -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 7659C2C048F; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674530477; bh=ui64NQiE46HAaxcvftxz384jJGVakZIhHVS3AZGc4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MkO6SfsVcBqyZIabT7s4v4lvj5186ktJS0G137V8a1RVZ3O5cVyIiqEeB2eIccGd8 jLm6amugln1A/5TtCs/+mSNHXmhoxFiIq1PVQWLMAnQEXSLAKA6CG/bhf94hx8gqKF tnA7ELGTJ+tUvxW+zfVguEwsF8rpQLsOmWHWynNu4ZXWts+KRuJjuqsofVxoFSwUou eAWeUF6I8YNPzH08XqYiF64U4U0m9mR9jt5z6YvQwABnhetv7uk7oX4SZ8BNHJNiP+ FA3bfpfw10RytutgdO71WtrLOir2uA8kHjAEBMYf05g7Drx5gRGkCl4hmNXDEnMVDA x6Yr896zt7Z8w== 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 ; Tue, 24 Jan 2023 16:21:17 +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 08E5413EE8E; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 048933E07A3; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH v3 1/2] ip/ip6_gre: Fix changing addr gen mode not generating IPv6 link local address Date: Tue, 24 Jan 2023 16:21:04 +1300 Message-Id: <20230124032105.79487-4-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA:10 a=HROInG98OEpMAGfJxuYA: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 | 51 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index f7a84a4acffc..0065b38fc85b 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 addrconfig_init_auto_addrs(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) @@ -3615,26 +3639,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; - } + addrconfig_init_auto_addrs(dev); =20 if (!IS_ERR_OR_NULL(idev)) { if (run_pending) @@ -6397,7 +6402,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_t= able *ctl, int write, =20 if (idev->cnf.addr_gen_mode !=3D new_val) { idev->cnf.addr_gen_mode =3D new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } else if (&net->ipv6.devconf_all->addr_gen_mode =3D=3D ctl->data) { struct net_device *dev; @@ -6408,7 +6413,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_t= able *ctl, int write, if (idev && idev->cnf.addr_gen_mode !=3D new_val) { idev->cnf.addr_gen_mode =3D new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } } --=20 2.39.0 From nobody Sun Sep 14 09:42:05 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 10CEFC25B50 for ; Tue, 24 Jan 2023 03:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbjAXDV0 (ORCPT ); Mon, 23 Jan 2023 22:21:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjAXDVW (ORCPT ); Mon, 23 Jan 2023 22:21:22 -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 885B23929C for ; Mon, 23 Jan 2023 19:21:20 -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 85B292C04E0; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674530477; bh=RJyNL7zkvASp8mnzpGcUDOtXg0g+og7dKoNKjOxAkHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbXFqWO4HsgPFbo+qV8vfkiKZeJ4a91//4vV6bpUAabSUZofaEdIG/3Ex8wnb38Q8 78zQsJ0/eRgqTTYEbgY6PXmDhrloRq3H6mTUPQ9GIYhqpUPVo89YmklF5hLdhxHQzX 6PzM7ijgRReuAPI7xL3a/klI6HzPmqoKlFiz7iAMmv4qemN4+qt1jXsGhveYenK4PX MmpnKItDbHUjOTPN+96e6zxtjOCcRb/Shozhs5iDoFRUUdg5XZNyAj79wIINqQPR2u 8e8+8hP095ClPN07fnrfj19eh65pwvPXBruiNkf4QQ5/DApfhjQvMjt1WoqImAsBQ9 s5ZDlapFyuUmA== 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 ; Tue, 24 Jan 2023 16:21:17 +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 09A6513EE9C; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 0726A3E079C; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH v3 2/2] ip/ip6_gre: Fix non-point-to-point tunnel not generating IPv6 link local address Date: Tue, 24 Jan 2023 16:21:05 +1300 Message-Id: <20230124032105.79487-5-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA: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 0065b38fc85b..a45d7544d6a6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3127,17 +3127,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.39.0 From nobody Sun Sep 14 09:42:05 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 A0F35C05027 for ; Tue, 24 Jan 2023 03:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbjAXDVe (ORCPT ); Mon, 23 Jan 2023 22:21:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232045AbjAXDVX (ORCPT ); Mon, 23 Jan 2023 22:21:23 -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 E0EB739B9F for ; Mon, 23 Jan 2023 19:21:21 -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 7FA742C04AC; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674530477; bh=RJyNL7zkvASp8mnzpGcUDOtXg0g+og7dKoNKjOxAkHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=myH8jxfa2IV6vCQuAgvy6bdU4NOQGTe4VwDSZ9b8K7859tkLTTml3AKfnxEvY0Bhp zUZwXtg5uCaqVIhl1U4ZNpPMfHlyzyTENfNv0gpNq3ioKHgHNprZTtib5bGxHqMqNr nTuEih4qdV5WD8wfGEmd/jTYpW6ALuSI3fZlA4wLZgU7Ny1k2Licg9cGkR8I4Iur7Q H5iVTu0WZ/Zve13YZDz7xmEp0fKENulHdvVJqnss7HnLp+1i9boySZf/2YqZCLySoL mZ3AZqzI+wAWiDSqj/zC34DERIpz99e/81hfa7ZRJYSLzFfGehcixzqsoCCdcCF1Rt Iz7uLsAbq4aCg== 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 ; Tue, 24 Jan 2023 16:21:17 +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 0817D13EE82; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 03CAD3E07A1; Tue, 24 Jan 2023 16:21:17 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, 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: Tue, 24 Jan 2023 16:21:03 +1300 Message-Id: <20230124032105.79487-3-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230124032105.79487-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA: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 0065b38fc85b..a45d7544d6a6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3127,17 +3127,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.39.0