inet: Fix BUG triggered by __rt{,6}_get_peer().

If no peer actually gets attached (either because create is zero or
the peer allocation fails) we'll trigger a BUG because we
unconditionally do an rt{,6}_peer_ptr() afterwards.

Fix this by guarding it with the proper check.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index f88a85cf31c3260f3653b470ba7e188c750f21d6..a2cda240ca95fd5d3c4a0927da45673a8acce9c2 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -61,7 +61,7 @@ static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create)
                return rt6_peer_ptr(rt);
 
        rt6_bind_peer(rt, create);
-       return rt6_peer_ptr(rt);
+       return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL);
 }
 
 static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)

diff --git a/include/net/route.h b/include/net/route.h
index cc693a5bb20d1a8e48683e3295dc4963f08ba4c5..2bfbc9329ea9c441b83a6aec05d29a7257c412cc 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -334,7 +334,7 @@ static inline struct inet_peer *__rt_get_peer(struct rtable *rt, __be32 daddr, i
                return rt_peer_ptr(rt);
 
        rt_bind_peer(rt, daddr, create);
-       return rt_peer_ptr(rt);
+       return (rt_has_peer(rt) ? rt_peer_ptr(rt) : NULL);
 }
 
 static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)