lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 023/235] xfrm: fix passing zero to ERR_PTR() warning
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 934ffce1343f22ed5e2d0bd6da4440f4848074de ]

    Fix a static code checker warning:

    net/xfrm/xfrm_policy.c:1836 xfrm_resolve_and_create_bundle() warn: passing zero to 'ERR_PTR'

    xfrm_tmpl_resolve return 0 just means no xdst found, return NULL
    instead of passing zero to ERR_PTR.

    Fixes: d809ec895505 ("xfrm: do not assume that template resolving always returns xfrms")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/xfrm/xfrm_policy.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/net/xfrm/xfrm_policy.c
    +++ b/net/xfrm/xfrm_policy.c
    @@ -1831,7 +1831,10 @@ xfrm_resolve_and_create_bundle(struct xf
    /* Try to instantiate a bundle */
    err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family);
    if (err <= 0) {
    - if (err != 0 && err != -EAGAIN)
    + if (err == 0)
    + return NULL;
    +
    + if (err != -EAGAIN)
    XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
    return ERR_PTR(err);
    }

    \
     
     \ /
      Last update: 2018-09-24 14:52    [W:4.057 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site