Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

3 files changed, 9 insertions, 17 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 5a7265aeaf83..ee6ae74cd1b2 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -160,7 +160,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
                                 " unsupported checksum %d", cksumtype);
                         goto out;
         }
-        if (!(tfm = crypto_alloc_tfm(cksumname, 0)))
+        if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP)))
                 goto out;
         cksum->len = crypto_tfm_alg_digestsize(tfm);
         if ((cksum->data = kmalloc(cksum->len, GFP_KERNEL)) == NULL)
@@ -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);
 }