1 files changed, 9 insertions, 6 deletions

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 93a2f36ad3db..17b29ec3c417 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -77,6 +77,8 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x)
         kfree(x->ealg);
         kfree(x->calg);
         kfree(x->encap);
+        if (x->mode)
+                xfrm_put_mode(x->mode);
         if (x->type) {
                 x->type->destructor(x);
                 xfrm_put_type(x->type);
@@ -1103,17 +1105,14 @@ static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family)
                 return NULL;
         read_lock(&xfrm_state_afinfo_lock);
         afinfo = xfrm_state_afinfo[family];
-        if (likely(afinfo != NULL))
-                read_lock(&afinfo->lock);
-        read_unlock(&xfrm_state_afinfo_lock);
+        if (unlikely(!afinfo))
+                read_unlock(&xfrm_state_afinfo_lock);
         return afinfo;
 }
 
 static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo)
 {
-        if (unlikely(afinfo == NULL))
-                return;
-        read_unlock(&afinfo->lock);
+        read_unlock(&xfrm_state_afinfo_lock);
 }
 
 /* Temporarily located here until net/xfrm/xfrm_tunnel.c is created */
@@ -1196,6 +1195,10 @@ int xfrm_init_state(struct xfrm_state *x)
         if (err)
                 goto error;
 
+        x->mode = xfrm_get_mode(x->props.mode, family);
+        if (x->mode == NULL)
+                goto error;
+
         x->km.state = XFRM_STATE_VALID;
 
 error: