From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Benjamin Poirier <bpoirier@suse.com>,
Steffen Klassert <steffen.klassert@secunet.com>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 07/35] xfrm: Fix bucket count reported to userspace
Date: Wed, 26 Dec 2018 17:41:14 -0500 [thread overview]
Message-ID: <20181226224142.150866-7-sashal@kernel.org> (raw)
In-Reply-To: <20181226224142.150866-1-sashal@kernel.org>
From: Benjamin Poirier <bpoirier@suse.com>
[ 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 71a94e549301..884f2136b34b 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -641,7 +641,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
next prev parent reply other threads:[~2018-12-26 23:00 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 22:41 [PATCH AUTOSEL 4.9 01/35] pinctrl: meson: fix pull enable register calculation Sasha Levin
2018-12-26 22:41 ` Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 02/35] powerpc: Fix COFF zImage booting on old powermacs Sasha Levin
2018-12-26 22:41 ` Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 03/35] ARM: imx: update the cpu power up timing setting on i.mx6sx Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 04/35] ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 05/35] Input: restore EV_ABS ABS_RESERVED Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 06/35] checkstack.pl: fix for aarch64 Sasha Levin
2018-12-26 22:41 ` Sasha Levin [this message]
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 08/35] netfilter: seqadj: re-load tcp header pointer after possible head reallocation Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 09/35] scsi: bnx2fc: Fix NULL dereference in error handling Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 10/35] Input: omap-keypad - fix idle configuration to not block SoC idle states Sasha Levin
2018-12-26 22:41 ` Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 11/35] USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 12/35] netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 13/35] bnx2x: Clear fip MAC when fcoe offload support is disabled Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 14/35] bnx2x: Remove configured vlans as part of unload sequence Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 15/35] bnx2x: Send update-svid ramrod with retry/poll flags enabled Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 16/35] scsi: target: iscsi: cxgbit: fix csk leak Sasha Levin
2018-12-26 22:41 ` Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 17/35] scsi: target: iscsi: cxgbit: add missing spin_lock_init() Sasha Levin
2018-12-26 22:41 ` Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 18/35] drivers: net: xgene: Remove unnecessary forward declarations Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 19/35] w90p910_ether: remove incorrect __init annotation Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 20/35] net: hns: Incorrect offset address used for some registers Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 21/35] net: hns: All ports can not work when insmod hns ko after rmmod Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 22/35] net: hns: Some registers use wrong address according to the datasheet Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 23/35] net: hns: Fixed bug that netdev was opened twice Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 24/35] net: hns: Clean rx fbd when ae stopped Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 25/35] net: hns: Free irq when exit from abnormal branch Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 26/35] net: hns: Avoid net reset caused by pause frames storm Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 27/35] net: hns: Fix ntuple-filters status error Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 28/35] net: hns: Add mac pcs config when enable|disable mac Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 29/35] SUNRPC: Fix a race with XPRT_CONNECTING Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 30/35] x86/mtrr: Don't copy uninitialized gentry fields back to userspace Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 31/35] lan78xx: Resolve issue with changing MAC address Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 32/35] xen/netfront: tolerate frags with no data Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 33/35] vxge: ensure data0 is initialized in when fetching firmware version information Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 34/35] net: netxen: fix a missing check and an uninitialized use Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 35/35] serial/sunsu: fix refcount leak Sasha Levin
2018-12-26 22:41 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181226224142.150866-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bpoirier@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.