releases/4.4.170/xfrm-fix-bucket-count-reported-to-userspace.patch

   1 From e319078c64517ddd322fa6d773705b78c4db0cb1 Mon Sep 17 00:00:00 2001
   2 From: Benjamin Poirier <bpoirier@suse.com>
   3 Date: Mon, 5 Nov 2018 17:00:53 +0900
   4 Subject: xfrm: Fix bucket count reported to userspace
   5
   6 [ Upstream commit ca92e173ab34a4f7fc4128bd372bd96f1af6f507 ]
   7
   8 sadhcnt is reported by `ip -s xfrm state count` as "buckets count", not the
   9 hash mask.
  10
  11 Fixes: 28d8909bc790 ("[XFRM]: Export SAD info.")
  12 Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
  13 Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  net/xfrm/xfrm_state.c | 2 +-
  17  1 file changed, 1 insertion(+), 1 deletion(-)
  18
  19 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
  20 index 9b6e51450fc5..13f261feb75c 100644
  21 --- a/net/xfrm/xfrm_state.c
  22 +++ b/net/xfrm/xfrm_state.c
  23 @@ -623,7 +623,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si)
  24  {
  25         spin_lock_bh(&net->xfrm.xfrm_state_lock);
  26         si->sadcnt = net->xfrm.state_num;
  27 -       si->sadhcnt = net->xfrm.state_hmask;
  28 +       si->sadhcnt = net->xfrm.state_hmask + 1;
  29         si->sadhmcnt = xfrm_state_hashmax;
  30         spin_unlock_bh(&net->xfrm.xfrm_state_lock);
  31  }
  32 --
  33 2.19.1
  34