Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes an NFS regression caused by the skcipher/hash conversion in
  sunrpc.  It also fixes a build problem in certain configurations with
  bcm63xx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm63xx - fix device tree compilation
  sunrpc: Fix skcipher/shash conversion

3 files changed, 9 insertions, 3 deletions

diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index ca9c40309757..5132c9cde50d 100644
--- a/drivers/char/hw_random/bcm63xx-rng.c
+++ b/drivers/char/hw_random/bcm63xx-rng.c
@@ -12,6 +12,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
+#include <linux/of.h>
 
 #define RNG_CTRL                        0x00
 #define RNG_EN                          (1 << 0)
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 045e11ecd332..244245bcbbd2 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -78,6 +78,7 @@ krb5_encrypt(
         memcpy(out, in, length);
         sg_init_one(sg, out, length);
 
+        skcipher_request_set_tfm(req, tfm);
         skcipher_request_set_callback(req, 0, NULL, NULL);
         skcipher_request_set_crypt(req, sg, sg, length, local_iv);
 
@@ -115,6 +116,7 @@ krb5_decrypt(
         memcpy(out, in, length);
         sg_init_one(sg, out, length);
 
+        skcipher_request_set_tfm(req, tfm);
         skcipher_request_set_callback(req, 0, NULL, NULL);
         skcipher_request_set_crypt(req, sg, sg, length, local_iv);
 
@@ -946,7 +948,8 @@ krb5_rc4_setup_seq_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,
                 return PTR_ERR(hmac);
         }
 
-        desc = kmalloc(sizeof(*desc), GFP_KERNEL);
+        desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac),
+                       GFP_KERNEL);
         if (!desc) {
                 dprintk("%s: failed to allocate shash descriptor for '%s'\n",
                         __func__, kctx->gk5e->cksum_name);
@@ -1012,7 +1015,8 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,
                 return PTR_ERR(hmac);
         }
 
-        desc = kmalloc(sizeof(*desc), GFP_KERNEL);
+        desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac),
+                       GFP_KERNEL);
         if (!desc) {
                 dprintk("%s: failed to allocate shash descriptor for '%s'\n",
                         __func__, kctx->gk5e->cksum_name);
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index 71341ccb9890..65427492b1c9 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -451,7 +451,8 @@ context_derive_keys_rc4(struct krb5_ctx *ctx)
                 goto out_err_free_hmac;
 
 
-        desc = kmalloc(sizeof(*desc), GFP_KERNEL);
+        desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac),
+                       GFP_KERNEL);
         if (!desc) {
                 dprintk("%s: failed to allocate hash descriptor for '%s'\n",
                         __func__, ctx->gk5e->cksum_name);