lkml.org 
[lkml]   [2022]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 18/29] ipv6/sit: fix ipip6_tunnel_get_prl return value
    Date
    From: katrinzhou <katrinzhou@tencent.com>

    commit adabdd8f6acabc0c3fdbba2e7f5a2edd9c5ef22d upstream.

    When kcalloc fails, ipip6_tunnel_get_prl() should return -ENOMEM.
    Move the position of label "out" to return correctly.

    Addresses-Coverity: ("Unused value")
    Fixes: 300aaeeaab5f ("[IPV6] SIT: Add SIOCGETPRL ioctl to get/dump PRL.")
    Signed-off-by: katrinzhou <katrinzhou@tencent.com>
    Reviewed-by: Eric Dumazet<edumazet@google.com>
    Reviewed-by: David Ahern <dsahern@kernel.org>
    Link: https://lore.kernel.org/r/20220628035030.1039171-1-zys.zljxml@gmail.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/sit.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    --- a/net/ipv6/sit.c
    +++ b/net/ipv6/sit.c
    @@ -308,8 +308,6 @@ static int ipip6_tunnel_get_prl(struct i
    kcalloc(cmax, sizeof(*kp), GFP_KERNEL) :
    NULL;

    - rcu_read_lock();
    -
    ca = min(t->prl_count, cmax);

    if (!kp) {
    @@ -325,7 +323,7 @@ static int ipip6_tunnel_get_prl(struct i
    }
    }

    - c = 0;
    + rcu_read_lock();
    for_each_prl_rcu(t->prl) {
    if (c >= cmax)
    break;
    @@ -337,7 +335,7 @@ static int ipip6_tunnel_get_prl(struct i
    if (kprl.addr != htonl(INADDR_ANY))
    break;
    }
    -out:
    +
    rcu_read_unlock();

    len = sizeof(*kp) * c;
    @@ -346,7 +344,7 @@ out:
    ret = -EFAULT;

    kfree(kp);
    -
    +out:
    return ret;
    }


    \
     
     \ /
      Last update: 2022-07-05 14:01    [W:4.342 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site