lkml.org 
[lkml]   [2019]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 010/105] xfrm: Fix bucket count reported to userspace
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit ca92e173ab34a4f7fc4128bd372bd96f1af6f507 ]

    sadhcnt is reported by `ip -s xfrm state count` as "buckets count", not the
    hash mask.

    Fixes: 28d8909bc790 ("[XFRM]: Export SAD info.")
    Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/xfrm/xfrm_state.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
    index 6c4ec69e11a0..0cd2bdf3b217 100644
    --- a/net/xfrm/xfrm_state.c
    +++ b/net/xfrm/xfrm_state.c
    @@ -789,7 +789,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si)
    {
    spin_lock_bh(&net->xfrm.xfrm_state_lock);
    si->sadcnt = net->xfrm.state_num;
    - si->sadhcnt = net->xfrm.state_hmask;
    + si->sadhcnt = net->xfrm.state_hmask + 1;
    si->sadhmcnt = xfrm_state_hashmax;
    spin_unlock_bh(&net->xfrm.xfrm_state_lock);
    }
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-01-11 15:31    [W:4.242 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site