aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-03-27 05:53:52 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-27 18:48:35 -0400
commit94f826b8076e2cb92242061e92f21b5baa3eccc2 (patch)
treebb9893bf45ef93842a315b5ed8287ae1f11ae41b /net/ipv6/route.c
parent50269e19ad990e79eeda101fc6df80cffd5d4831 (diff)
net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
Commit f2c31e32b378 (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>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 24c456e8aa1d..496b62712fe8 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2474,8 +2474,12 @@ static int rt6_fill_node(struct net *net,
2474 2474
2475 rcu_read_lock(); 2475 rcu_read_lock();
2476 n = dst_get_neighbour_noref(&rt->dst); 2476 n = dst_get_neighbour_noref(&rt->dst);
2477 if (n) 2477 if (n) {
2478 NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key); 2478 if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {
2479 rcu_read_unlock();
2480 goto nla_put_failure;
2481 }
2482 }
2479 rcu_read_unlock(); 2483 rcu_read_unlock();
2480 2484
2481 if (rt->dst.dev) 2485 if (rt->dst.dev)