lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sit: link local routes are missing

Browse Source 
When a link local address was added to a sit interface, the corresponding route
was not configured. This breaks routing protocols that use the link local
address, like OSPFv3.

To ease the code reading, I remove sit_route_add(), which only adds v4 mapped
routes, and add this kind of route directly in sit_add_v4_addrs(). Thus link
local and v4 mapped routes are configured in the same place.

Reported-by: Li Hongjun <hongjun.li@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel
2013-11-14 13:51:06 +01:00
committed by David S. Miller
parent 929c9cf310
commit f0e2acfa30
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net/ipv6/addrconf.c
View File

@@ -1982,23 +1982,6 @@ static void addrconf_add_mroute(struct net_device *dev)
ip6_route_add(&cfg); ip6_route_add(&cfg);
} }
#if IS_ENABLED(CONFIG_IPV6_SIT)
static void sit_route_add(struct net_device *dev)
{
struct fib6_config cfg = {
.fc_table = RT6_TABLE_MAIN,
.fc_metric = IP6_RT_PRIO_ADDRCONF,
.fc_ifindex = dev->ifindex,
.fc_dst_len = 96,
.fc_flags = RTF_UP | RTF_NONEXTHOP,
.fc_nlinfo.nl_net = dev_net(dev),
};
/* prefix length - 96 bits "::d.d.d.d" */
ip6_route_add(&cfg);
}
#endif
static struct inet6_dev *addrconf_add_dev(struct net_device *dev) static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
{ {
struct inet6_dev *idev; struct inet6_dev *idev;
@@ -2529,6 +2512,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
struct net_device *dev; struct net_device *dev;
struct net *net = dev_net(idev->dev); struct net *net = dev_net(idev->dev);
int scope, plen; int scope, plen;
u32 pflags = 0;
ASSERT_RTNL(); ASSERT_RTNL();
@@ -2542,10 +2526,12 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
} else { } else {
scope = IPV6_ADDR_COMPATv4; scope = IPV6_ADDR_COMPATv4;
plen = 96; plen = 96;
pflags |= RTF_NONEXTHOP;
} }
if (addr.s6_addr32[3]) { if (addr.s6_addr32[3]) {
add_addr(idev, &addr, plen, scope); add_addr(idev, &addr, plen, scope);
addrconf_prefix_route(&addr, plen, idev->dev, 0, pflags);
return; return;
} }
@@ -2569,6 +2555,8 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
} }
add_addr(idev, &addr, plen, flag); add_addr(idev, &addr, plen, flag);
addrconf_prefix_route(&addr, plen, idev->dev, 0,
pflags);
} }
} }
} }
@@ -2704,8 +2692,6 @@ static void addrconf_sit_config(struct net_device *dev)
if (dev->flags&IFF_POINTOPOINT) if (dev->flags&IFF_POINTOPOINT)
addrconf_add_mroute(dev); addrconf_add_mroute(dev);
else
sit_route_add(dev);
} }
#endif #endif