diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-11 04:13:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-11 04:13:57 -0700 |
| commit | 7b34ca2ac7063f4ebf07f85fd75253ed84d5c648 (patch) | |
| tree | 639e89875cd047bb461ab61348050586ceca56b2 /net/ipv6/route.c | |
| parent | 8b96d22d7a6ec999ae53ae86d829137503ceda65 (diff) | |
| download | lwn-7b34ca2ac7063f4ebf07f85fd75253ed84d5c648.tar.gz lwn-7b34ca2ac7063f4ebf07f85fd75253ed84d5c648.zip | |
inet: Avoid potential NULL peer dereference.
We handle NULL in rt{,6}_set_peer but then our caller will try to pass
that NULL pointer into inet_putpeer() which isn't ready for it.
Fix this by moving the NULL check one level up, and then remove the
now unnecessary NULL check from inetpeer_ptr_set_peer().
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d9ba4808f26a..58a3ec23da2f 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -313,10 +313,12 @@ void rt6_bind_peer(struct rt6_info *rt, int create) return; peer = inet_getpeer_v6(base, &rt->rt6i_dst.addr, create); - if (!rt6_set_peer(rt, peer)) - inet_putpeer(peer); - else - rt->rt6i_peer_genid = rt6_peer_genid(); + if (peer) { + if (!rt6_set_peer(rt, peer)) + inet_putpeer(peer); + else + rt->rt6i_peer_genid = rt6_peer_genid(); + } } static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, |