diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-23 13:37:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 23:10:42 -0800 |
| commit | e071041be037eca208b62b84469a06bdfc692bea (patch) | |
| tree | c78506a4a582555959ffeb94980cb0cd7f86eab5 /net/xfrm/xfrm_state.c | |
| parent | 2ca4231de7f7a5fd7137bac152030ba71f15e8c3 (diff) | |
| download | lwn-e071041be037eca208b62b84469a06bdfc692bea.tar.gz lwn-e071041be037eca208b62b84469a06bdfc692bea.zip | |
netns xfrm: fix "ip xfrm state|policy count" misreport
"ip xfrm state|policy count" report SA/SP count from init_net,
not from netns of caller process.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index d847f1a52b44..b36cc344474b 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -641,11 +641,11 @@ out: } EXPORT_SYMBOL(xfrm_state_flush); -void xfrm_sad_getinfo(struct xfrmk_sadinfo *si) +void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si) { spin_lock_bh(&xfrm_state_lock); - si->sadcnt = init_net.xfrm.state_num; - si->sadhcnt = init_net.xfrm.state_hmask; + si->sadcnt = net->xfrm.state_num; + si->sadhcnt = net->xfrm.state_hmask; si->sadhmcnt = xfrm_state_hashmax; spin_unlock_bh(&xfrm_state_lock); } |