| From e319078c64517ddd322fa6d773705b78c4db0cb1 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Poirier <bpoirier@suse.com> |
| Date: Mon, 5 Nov 2018 17:00:53 +0900 |
| Subject: xfrm: Fix bucket count reported to userspace |
| |
| [ 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 9b6e51450fc5..13f261feb75c 100644 |
| --- a/net/xfrm/xfrm_state.c |
| +++ b/net/xfrm/xfrm_state.c |
| @@ -623,7 +623,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 |
| |
