2 files changed, 22 insertions, 0 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 7c7bb54f2265..fcf8c928285a 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2441,9 +2441,23 @@ out_byidx:
 
 static void xfrm_policy_fini(struct net *net)
 {
+        struct xfrm_audit audit_info;
         unsigned int sz;
         int dir;
 
+        flush_work(&net->xfrm.policy_hash_work);
+#ifdef CONFIG_XFRM_SUB_POLICY
+        audit_info.loginuid = -1;
+        audit_info.sessionid = -1;
+        audit_info.secid = 0;
+        xfrm_policy_flush(net, XFRM_POLICY_TYPE_SUB, &audit_info);
+#endif
+        audit_info.loginuid = -1;
+        audit_info.sessionid = -1;
+        audit_info.secid = 0;
+        xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info);
+        flush_work(&xfrm_policy_gc_work);
+
         WARN_ON(!list_empty(&net->xfrm.policy_all));
 
         for (dir = 0; dir < XFRM_POLICY_MAX * 2; dir++) {
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index d594b5af5f6b..662e47b0bcc3 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2114,8 +2114,16 @@ out_bydst:
 
 void xfrm_state_fini(struct net *net)
 {
+        struct xfrm_audit audit_info;
         unsigned int sz;
 
+        flush_work(&net->xfrm.state_hash_work);
+        audit_info.loginuid = -1;
+        audit_info.sessionid = -1;
+        audit_info.secid = 0;
+        xfrm_state_flush(net, IPSEC_PROTO_ANY, &audit_info);
+        flush_work(&net->xfrm.state_gc_work);
+
         WARN_ON(!list_empty(&net->xfrm.state_all));
 
         sz = (net->xfrm.state_hmask + 1) * sizeof(struct hlist_head);