Commit 94f826b8 authored Mar 27, 2012 by Eric Dumazet Committed by David S. Miller Mar 27, 2012

net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()



Commit f2c31e32 (net: fix NULL dereferences in check_peer_redir() )
added a regression in rt6_fill_node(), leading to rcu_read_lock()
imbalance.

Thats because NLA_PUT() can make a jump to nla_put_failure label.

Fix this by using nla_put()

Many thanks to Ben Greear for his help

Reported-by: Ben Greear <greearb@candelatech.com>
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 50269e19

net/ipv6/route.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2474,8 +2474,12 @@ static int rt6_fill_node(struct net *net,

		rcu_read_lock();
		n = dst_get_neighbour_noref(&rt->dst);
		if (n)
		NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);
		if (n) {
		if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {
		rcu_read_unlock();
		goto nla_put_failure;
		}
		}
		rcu_read_unlock();

		if (rt->dst.dev)

Admin message