12 files changed, 42 insertions, 84 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 514c85b2631a..035ad2c9e1ba 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -263,10 +263,8 @@ static int ah_init_state(struct xfrm_state *x)
 
 error:
         if (ahp) {
-                if (ahp->work_icv)
-                        kfree(ahp->work_icv);
-                if (ahp->tfm)
-                        crypto_free_tfm(ahp->tfm);
+                kfree(ahp->work_icv);
+                crypto_free_tfm(ahp->tfm);
                 kfree(ahp);
         }
         return -EINVAL;
@@ -279,14 +277,10 @@ static void ah_destroy(struct xfrm_state *x)
         if (!ahp)
                 return;
 
-        if (ahp->work_icv) {
-                kfree(ahp->work_icv);
-                ahp->work_icv = NULL;
-        }
-        if (ahp->tfm) {
-                crypto_free_tfm(ahp->tfm);
-                ahp->tfm = NULL;
-        }
+        kfree(ahp->work_icv);
+        ahp->work_icv = NULL;
+        crypto_free_tfm(ahp->tfm);
+        ahp->tfm = NULL;
         kfree(ahp);
 }
 
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index b31ffc5053d2..1b5a09d1b90b 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -343,22 +343,14 @@ static void esp_destroy(struct xfrm_state *x)
         if (!esp)
                 return;
 
-        if (esp->conf.tfm) {
-                crypto_free_tfm(esp->conf.tfm);
-                esp->conf.tfm = NULL;
-        }
-        if (esp->conf.ivec) {
-                kfree(esp->conf.ivec);
-                esp->conf.ivec = NULL;
-        }
-        if (esp->auth.tfm) {
-                crypto_free_tfm(esp->auth.tfm);
-                esp->auth.tfm = NULL;
-        }
-        if (esp->auth.work_icv) {
-                kfree(esp->auth.work_icv);
-                esp->auth.work_icv = NULL;
-        }
+        crypto_free_tfm(esp->conf.tfm);
+        esp->conf.tfm = NULL;
+        kfree(esp->conf.ivec);
+        esp->conf.ivec = NULL;
+        crypto_free_tfm(esp->auth.tfm);
+        esp->auth.tfm = NULL;
+        kfree(esp->auth.work_icv);
+        esp->auth.work_icv = NULL;
         kfree(esp);
 }
 
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index dcb7ee6c4858..fc718df17b40 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -345,8 +345,7 @@ static void ipcomp_free_tfms(struct crypto_tfm **tfms)
 
         for_each_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
-                if (tfm)
-                        crypto_free_tfm(tfm);
+                crypto_free_tfm(tfm);
         }
         free_percpu(tfms);
 }
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 937ad32db77c..6d6fb74f3b52 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3593,10 +3593,8 @@ void __exit addrconf_cleanup(void)
         rtnl_unlock();
 
 #ifdef CONFIG_IPV6_PRIVACY
-        if (likely(md5_tfm != NULL)) {
-                crypto_free_tfm(md5_tfm);
-                md5_tfm = NULL;
-        }
+        crypto_free_tfm(md5_tfm);
+        md5_tfm = NULL;
 #endif
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 0ebfad907a03..f3629730eb15 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -401,10 +401,8 @@ static int ah6_init_state(struct xfrm_state *x)
 
 error:
         if (ahp) {
-                if (ahp->work_icv)
-                        kfree(ahp->work_icv);
-                if (ahp->tfm)
-                        crypto_free_tfm(ahp->tfm);
+                kfree(ahp->work_icv);
+                crypto_free_tfm(ahp->tfm);
                 kfree(ahp);
         }
         return -EINVAL;
@@ -417,14 +415,10 @@ static void ah6_destroy(struct xfrm_state *x)
         if (!ahp)
                 return;
 
-        if (ahp->work_icv) {
-                kfree(ahp->work_icv);
-                ahp->work_icv = NULL;
-        }
-        if (ahp->tfm) {
-                crypto_free_tfm(ahp->tfm);
-                ahp->tfm = NULL;
-        }
+        kfree(ahp->work_icv);
+        ahp->work_icv = NULL;
+        crypto_free_tfm(ahp->tfm);
+        ahp->tfm = NULL;
         kfree(ahp);
 }
 
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index e8bff9d3d96c..9b27460f0cc7 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -276,22 +276,14 @@ static void esp6_destroy(struct xfrm_state *x)
         if (!esp)
                 return;
 
-        if (esp->conf.tfm) {
-                crypto_free_tfm(esp->conf.tfm);
-                esp->conf.tfm = NULL;
-        }
-        if (esp->conf.ivec) {
-                kfree(esp->conf.ivec);
-                esp->conf.ivec = NULL;
-        }
-        if (esp->auth.tfm) {
-                crypto_free_tfm(esp->auth.tfm);
-                esp->auth.tfm = NULL;
-        }
-        if (esp->auth.work_icv) {
-                kfree(esp->auth.work_icv);
-                esp->auth.work_icv = NULL;
-        }
+        crypto_free_tfm(esp->conf.tfm);
+        esp->conf.tfm = NULL;
+        kfree(esp->conf.ivec);
+        esp->conf.ivec = NULL;
+        crypto_free_tfm(esp->auth.tfm);
+        esp->auth.tfm = NULL;
+        kfree(esp->auth.work_icv);
+        esp->auth.work_icv = NULL;
         kfree(esp);
 }
 
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 135383ef538f..85bfbc69b2c3 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -341,8 +341,7 @@ static void ipcomp6_free_tfms(struct crypto_tfm **tfms)
 
         for_each_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
-                if (tfm)
-                        crypto_free_tfm(tfm);
+                crypto_free_tfm(tfm);
         }
         free_percpu(tfms);
 }
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index e47ac0d1a6d6..e22ccd655965 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -193,8 +193,7 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
         sctp_unhash_endpoint(ep);
 
         /* Free up the HMAC transform. */
-        if (sctp_sk(ep->base.sk)->hmac)
-                sctp_crypto_free_tfm(sctp_sk(ep->base.sk)->hmac);
+        sctp_crypto_free_tfm(sctp_sk(ep->base.sk)->hmac);
 
         /* Cleanup. */
         sctp_inq_free(&ep->base.inqueue);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 4454afe4727e..91ec8c936913 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4194,8 +4194,7 @@ out:
         sctp_release_sock(sk);
         return err;
 cleanup:
-        if (tfm)
-                sctp_crypto_free_tfm(tfm);
+        sctp_crypto_free_tfm(tfm);
         goto out;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 7ad74449b18f..ee6ae74cd1b2 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -199,8 +199,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
         crypto_digest_final(tfm, cksum->data);
         code = 0;
 out:
-        if (tfm)
-                crypto_free_tfm(tfm);
+        crypto_free_tfm(tfm);
         return code;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index cf726510df8e..606a8a82cafb 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -185,12 +185,9 @@ static void
 gss_delete_sec_context_kerberos(void *internal_ctx) {
         struct krb5_ctx *kctx = internal_ctx;
 
-        if (kctx->seq)
-                crypto_free_tfm(kctx->seq);
-        if (kctx->enc)
-                crypto_free_tfm(kctx->enc);
-        if (kctx->mech_used.data)
-                kfree(kctx->mech_used.data);
+        crypto_free_tfm(kctx->seq);
+        crypto_free_tfm(kctx->enc);
+        kfree(kctx->mech_used.data);
         kfree(kctx);
 }
 
diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index dad05994c3eb..6c97d61baa9b 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -214,14 +214,10 @@ static void
 gss_delete_sec_context_spkm3(void *internal_ctx) {
         struct spkm3_ctx *sctx = internal_ctx;
 
-        if(sctx->derived_integ_key)
-                crypto_free_tfm(sctx->derived_integ_key);
-        if(sctx->derived_conf_key)
-                crypto_free_tfm(sctx->derived_conf_key);
-        if(sctx->share_key.data)
-                kfree(sctx->share_key.data);
-        if(sctx->mech_used.data)
-                kfree(sctx->mech_used.data);
+        crypto_free_tfm(sctx->derived_integ_key);
+        crypto_free_tfm(sctx->derived_conf_key);
+        kfree(sctx->share_key.data);
+        kfree(sctx->mech_used.data);
         kfree(sctx);
 }