Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e033155d0b495becfdc28f46ad20089dc8a13060

Authored by Eric Dumazet
Committed by Greg Kroah-Hartman
1 parent 02241f8a5f
Exists in imx_3.0.35_4.1.0

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

[ Upstream commit 94f826b8076e2cb92242061e92f21b5baa3eccc2 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

... ... @@ -2411,8 +2411,12 @@
2411 2411  
2412 2412 rcu_read_lock();
2413 2413 n = dst_get_neighbour(&rt->dst);
2414   - if (n)
2415   - NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);
  2414 + if (n) {
  2415 + if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {
  2416 + rcu_read_unlock();
  2417 + goto nla_put_failure;
  2418 + }
  2419 + }
2416 2420 rcu_read_unlock();
2417 2421  
2418 2422 if (rt->dst.dev)