aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-09 22:12:36 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-09 22:12:36 -0400
commitc0efc887dcadbdbfe171f028acfab9c7c00e9dde (patch)
treed2f628d6c222c6328a6f310378d7227c32ebf183 /net/ipv6
parent8b51b064a6da90c68af5385a874968829a2a0ed7 (diff)
inet: Pass inetpeer root into inet_getpeer*() interfaces.
Otherwise we reference potentially non-existing members when ipv6 is disabled. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9586c27e069c..8fc41d502bbd 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -306,7 +306,7 @@ void rt6_bind_peer(struct rt6_info *rt, int create)
306 struct net *net = dev_net(rt->dst.dev); 306 struct net *net = dev_net(rt->dst.dev);
307 struct inet_peer *peer; 307 struct inet_peer *peer;
308 308
309 peer = inet_getpeer_v6(net, &rt->rt6i_dst.addr, create); 309 peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, create);
310 if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL) 310 if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL)
311 inet_putpeer(peer); 311 inet_putpeer(peer);
312 else 312 else