aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_state.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r--net/xfrm/xfrm_state.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f3f635d4ee66..5f4c5340ba30 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -576,15 +576,15 @@ EXPORT_SYMBOL(xfrm_state_delete);
576 576
577#ifdef CONFIG_SECURITY_NETWORK_XFRM 577#ifdef CONFIG_SECURITY_NETWORK_XFRM
578static inline int 578static inline int
579xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info) 579xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
580{ 580{
581 int i, err = 0; 581 int i, err = 0;
582 582
583 for (i = 0; i <= init_net.xfrm.state_hmask; i++) { 583 for (i = 0; i <= net->xfrm.state_hmask; i++) {
584 struct hlist_node *entry; 584 struct hlist_node *entry;
585 struct xfrm_state *x; 585 struct xfrm_state *x;
586 586
587 hlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+i, bydst) { 587 hlist_for_each_entry(x, entry, net->xfrm.state_bydst+i, bydst) {
588 if (xfrm_id_proto_match(x->id.proto, proto) && 588 if (xfrm_id_proto_match(x->id.proto, proto) &&
589 (err = security_xfrm_state_delete(x)) != 0) { 589 (err = security_xfrm_state_delete(x)) != 0) {
590 xfrm_audit_state_delete(x, 0, 590 xfrm_audit_state_delete(x, 0,
@@ -600,26 +600,26 @@ xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info)
600} 600}
601#else 601#else
602static inline int 602static inline int
603xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info) 603xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
604{ 604{
605 return 0; 605 return 0;
606} 606}
607#endif 607#endif
608 608
609int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info) 609int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info)
610{ 610{
611 int i, err = 0; 611 int i, err = 0;
612 612
613 spin_lock_bh(&xfrm_state_lock); 613 spin_lock_bh(&xfrm_state_lock);
614 err = xfrm_state_flush_secctx_check(proto, audit_info); 614 err = xfrm_state_flush_secctx_check(net, proto, audit_info);
615 if (err) 615 if (err)
616 goto out; 616 goto out;
617 617
618 for (i = 0; i <= init_net.xfrm.state_hmask; i++) { 618 for (i = 0; i <= net->xfrm.state_hmask; i++) {
619 struct hlist_node *entry; 619 struct hlist_node *entry;
620 struct xfrm_state *x; 620 struct xfrm_state *x;
621restart: 621restart:
622 hlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+i, bydst) { 622 hlist_for_each_entry(x, entry, net->xfrm.state_bydst+i, bydst) {
623 if (!xfrm_state_kern(x) && 623 if (!xfrm_state_kern(x) &&
624 xfrm_id_proto_match(x->id.proto, proto)) { 624 xfrm_id_proto_match(x->id.proto, proto)) {
625 xfrm_state_hold(x); 625 xfrm_state_hold(x);
@@ -641,7 +641,7 @@ restart:
641 641
642out: 642out:
643 spin_unlock_bh(&xfrm_state_lock); 643 spin_unlock_bh(&xfrm_state_lock);
644 wake_up(&init_net.xfrm.km_waitq); 644 wake_up(&net->xfrm.km_waitq);
645 return err; 645 return err;
646} 646}
647EXPORT_SYMBOL(xfrm_state_flush); 647EXPORT_SYMBOL(xfrm_state_flush);