openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: Fix neigh lookup using NULL device. 

In some of the rt6_bind_neighbour() call sites, it hasn't hooked
up the rt->dst.dev pointer yet, so we'd deref a NULL pointer when
obtaining dev->ifindex for the neighbour hash function computation.

Just pass the netdevice explicitly in to fix this problem.

Reported-by: Bjarke Istrup Pedersen <gurligebis@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-12-29 18:51:57 -05:00
parent f1776dade1
commit 8ade06c616
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/ipv6/route.c
View File

@ -129,11 +129,14 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, const voi
return neigh_create(&nd_tbl, daddr, dst->dev); return neigh_create(&nd_tbl, daddr, dst->dev);
} }
static int rt6_bind_neighbour(struct rt6_info *rt) static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev)
{ {
struct neighbour *n = ip6_neigh_lookup(&rt->dst, &rt->rt6i_gateway); struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dev, &rt->rt6i_gateway);
if (IS_ERR(n)) if (!n) {
return PTR_ERR(n); n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev);
if (IS_ERR(n))
return PTR_ERR(n);
}
dst_set_neighbour(&rt->dst, n); dst_set_neighbour(&rt->dst, n);
return 0; return 0;
@ -746,7 +749,7 @@ static struct rt6_info *rt6_alloc_cow(const struct rt6_info *ort,
#endif #endif
retry: retry:
if (rt6_bind_neighbour(rt)) { if (rt6_bind_neighbour(rt, rt->dst.dev)) {
struct net *net = dev_net(rt->dst.dev); struct net *net = dev_net(rt->dst.dev);
int saved_rt_min_interval = int saved_rt_min_interval =
net->ipv6.sysctl.ip6_rt_gc_min_interval; net->ipv6.sysctl.ip6_rt_gc_min_interval;
@ -1397,7 +1400,7 @@ int ip6_route_add(struct fib6_config *cfg)
rt->rt6i_prefsrc.plen = 0; rt->rt6i_prefsrc.plen = 0;
if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) { if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) {
err = rt6_bind_neighbour(rt); err = rt6_bind_neighbour(rt, dev);
if (err) if (err)
goto out; goto out;
} }
@ -2084,7 +2087,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
rt->rt6i_flags |= RTF_ANYCAST; rt->rt6i_flags |= RTF_ANYCAST;
else else
rt->rt6i_flags |= RTF_LOCAL; rt->rt6i_flags |= RTF_LOCAL;
err = rt6_bind_neighbour(rt); err = rt6_bind_neighbour(rt, rt->dst.dev);
if (err) { if (err) {
dst_free(&rt->dst); dst_free(&rt->dst);
return ERR_PTR(err); return ERR_PTR(err);