lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 098/108] net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Eric Dumazet <eric.dumazet@gmail.com>

    [ 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>
    ---
    net/ipv6/route.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/net/ipv6/route.c
    +++ b/net/ipv6/route.c
    @@ -2411,8 +2411,12 @@ static int rt6_fill_node(struct net *net

    rcu_read_lock();
    n = dst_get_neighbour(&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)



    \
     
     \ /
      Last update: 2012-03-30 23:11    [W:4.065 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site