aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c2
-rw-r--r--net/xfrm/xfrm_state.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 47c13649bac1..140bb9b384ac 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1986,6 +1986,7 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
1986 1986
1987EXPORT_SYMBOL(xfrm_bundle_ok); 1987EXPORT_SYMBOL(xfrm_bundle_ok);
1988 1988
1989#ifdef CONFIG_AUDITSYSCALL
1989/* Audit addition and deletion of SAs and ipsec policy */ 1990/* Audit addition and deletion of SAs and ipsec policy */
1990 1991
1991void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, 1992void xfrm_audit_log(uid_t auid, u32 sid, int type, int result,
@@ -2094,6 +2095,7 @@ void xfrm_audit_log(uid_t auid, u32 sid, int type, int result,
2094} 2095}
2095 2096
2096EXPORT_SYMBOL(xfrm_audit_log); 2097EXPORT_SYMBOL(xfrm_audit_log);
2098#endif /* CONFIG_AUDITSYSCALL */
2097 2099
2098int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) 2100int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
2099{ 2101{
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index d5d3a6f1f609..fdb08d9f34aa 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -407,7 +407,6 @@ restart:
407 xfrm_state_hold(x); 407 xfrm_state_hold(x);
408 spin_unlock_bh(&xfrm_state_lock); 408 spin_unlock_bh(&xfrm_state_lock);
409 409
410 xfrm_state_delete(x);
411 err = xfrm_state_delete(x); 410 err = xfrm_state_delete(x);
412 xfrm_audit_log(audit_info->loginuid, 411 xfrm_audit_log(audit_info->loginuid,
413 audit_info->secid, 412 audit_info->secid,