1 files changed, 6 insertions, 1 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index a75fae4b045a..f02f511b7107 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2913,15 +2913,19 @@ static int __net_init xfrm_net_init(struct net *net)
         rv = xfrm_sysctl_init(net);
         if (rv < 0)
                 goto out_sysctl;
+        rv = flow_cache_init(net);
+        if (rv < 0)
+                goto out;
 
         /* Initialize the per-net locks here */
         spin_lock_init(&net->xfrm.xfrm_state_lock);
         rwlock_init(&net->xfrm.xfrm_policy_lock);
         mutex_init(&net->xfrm.xfrm_cfg_mutex);
 
-        flow_cache_init(net);
         return 0;
 
+out:
+        xfrm_sysctl_fini(net);
 out_sysctl:
         xfrm_policy_fini(net);
 out_policy:
@@ -2934,6 +2938,7 @@ out_statistics:
 
 static void __net_exit xfrm_net_exit(struct net *net)
 {
+        flow_cache_fini(net);
         xfrm_sysctl_fini(net);
         xfrm_policy_fini(net);
         xfrm_state_fini(net);