Skip to content

Commit 3e6a024

Browse files
Guillaume Naultkuba-moo
authored andcommitted
gre: Fix again IPv6 link-local address generation.
Use addrconf_addr_gen() to generate IPv6 link-local addresses on GRE devices in most cases and fall back to using add_v4_addrs() only in case the GRE configuration is incompatible with addrconf_addr_gen(). GRE used to use addrconf_addr_gen() until commit e5dd729 ("ip/ip6_gre: use the same logic as SIT interfaces when computing v6LL address") restricted this use to gretap and ip6gretap devices, and created add_v4_addrs() (borrowed from SIT) for non-Ethernet GRE ones. The original problem came when commit 9af2851 ("addrconf: refuse isatap eui64 for INADDR_ANY") made __ipv6_isatap_ifid() fail when its addr parameter was 0. The commit says that this would create an invalid address, however, I couldn't find any RFC saying that the generated interface identifier would be wrong. Anyway, since gre over IPv4 devices pass their local tunnel address to __ipv6_isatap_ifid(), that commit broke their IPv6 link-local address generation when the local address was unspecified. Then commit e5dd729 ("ip/ip6_gre: use the same logic as SIT interfaces when computing v6LL address") tried to fix that case by defining add_v4_addrs() and calling it to generate the IPv6 link-local address instead of using addrconf_addr_gen() (apart for gretap and ip6gretap devices, which would still use the regular addrconf_addr_gen(), since they have a MAC address). That broke several use cases because add_v4_addrs() isn't properly integrated into the rest of IPv6 Neighbor Discovery code. Several of these shortcomings have been fixed over time, but add_v4_addrs() remains broken on several aspects. In particular, it doesn't send any Router Sollicitations, so the SLAAC process doesn't start until the interface receives a Router Advertisement. Also, add_v4_addrs() mostly ignores the address generation mode of the interface (/proc/sys/net/ipv6/conf/*/addr_gen_mode), thus breaking the IN6_ADDR_GEN_MODE_RANDOM and IN6_ADDR_GEN_MODE_STABLE_PRIVACY cases. Fix the situation by using add_v4_addrs() only in the specific scenario where the normal method would fail. That is, for interfaces that have all of the following characteristics: * run over IPv4, * transport IP packets directly, not Ethernet (that is, not gretap interfaces), * tunnel endpoint is INADDR_ANY (that is, 0), * device address generation mode is EUI64. In all other cases, revert back to the regular addrconf_addr_gen(). Also, remove the special case for ip6gre interfaces in add_v4_addrs(), since ip6gre devices now always use addrconf_addr_gen() instead. Note: This patch was originally applied as commit 183185a ("gre: Fix IPv6 link-local address generation."). However, it was then reverted by commit fc486c2 ("Revert "gre: Fix IPv6 link-local address generation."") because it uncovered another bug that ended up breaking net/forwarding/ip6gre_custom_multipath_hash.sh. That other bug has now been fixed by commit 4d0ab3a ("ipv6: Start path selection from the first nexthop"). Therefore we can now revive this GRE patch (no changes since original commit 183185a ("gre: Fix IPv6 link-local address generation."). Fixes: e5dd729 ("ip/ip6_gre: use the same logic as SIT interfaces when computing v6LL address") Signed-off-by: Guillaume Nault <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Link: https://patch.msgid.link/a88cc5c4811af36007645d610c95102dccb360a6.1746225214.git.gnault@redhat.com Signed-off-by: Jakub Kicinski <[email protected]>
1 parent c360eb0 commit 3e6a024

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

net/ipv6/addrconf.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3214,16 +3214,13 @@ static void add_v4_addrs(struct inet6_dev *idev)
32143214
struct in6_addr addr;
32153215
struct net_device *dev;
32163216
struct net *net = dev_net(idev->dev);
3217-
int scope, plen, offset = 0;
3217+
int scope, plen;
32183218
u32 pflags = 0;
32193219

32203220
ASSERT_RTNL();
32213221

32223222
memset(&addr, 0, sizeof(struct in6_addr));
3223-
/* in case of IP6GRE the dev_addr is an IPv6 and therefore we use only the last 4 bytes */
3224-
if (idev->dev->addr_len == sizeof(struct in6_addr))
3225-
offset = sizeof(struct in6_addr) - 4;
3226-
memcpy(&addr.s6_addr32[3], idev->dev->dev_addr + offset, 4);
3223+
memcpy(&addr.s6_addr32[3], idev->dev->dev_addr, 4);
32273224

32283225
if (!(idev->dev->flags & IFF_POINTOPOINT) && idev->dev->type == ARPHRD_SIT) {
32293226
scope = IPV6_ADDR_COMPATv4;
@@ -3534,7 +3531,13 @@ static void addrconf_gre_config(struct net_device *dev)
35343531
return;
35353532
}
35363533

3537-
if (dev->type == ARPHRD_ETHER) {
3534+
/* Generate the IPv6 link-local address using addrconf_addr_gen(),
3535+
* unless we have an IPv4 GRE device not bound to an IP address and
3536+
* which is in EUI64 mode (as __ipv6_isatap_ifid() would fail in this
3537+
* case). Such devices fall back to add_v4_addrs() instead.
3538+
*/
3539+
if (!(dev->type == ARPHRD_IPGRE && *(__be32 *)dev->dev_addr == 0 &&
3540+
idev->cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_EUI64)) {
35383541
addrconf_addr_gen(idev, true);
35393542
return;
35403543
}

0 commit comments

Comments
 (0)