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 the following issues:

   - Compiler warning in caam driver that was the last one remaining

   - Do not register aes-xts in caam drivers on unsupported platforms

   - Regression in algif_hash interface that may lead to an oops"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_hash - Fix NULL hash crash with shash
  crypto: caam - fix type mismatch warning
  crypto: caam - do not register AES-XTS mode on LP units

2 files changed, 20 insertions, 8 deletions

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 2d8466f9e49b..05e21b464433 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -214,23 +214,26 @@ static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 
         ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0);
 
-        if (ctx->more) {
+        if (!result) {
+                err = af_alg_wait_for_completion(
+                                crypto_ahash_init(&ctx->req),
+                                &ctx->completion);
+                if (err)
+                        goto unlock;
+        }
+
+        if (!result || ctx->more) {
                 ctx->more = 0;
                 err = af_alg_wait_for_completion(crypto_ahash_final(&ctx->req),
                                                  &ctx->completion);
                 if (err)
                         goto unlock;
-        } else if (!result) {
-                err = af_alg_wait_for_completion(
-                                crypto_ahash_digest(&ctx->req),
-                                &ctx->completion);
         }
 
         err = memcpy_to_msg(msg, ctx->result, len);
 
-        hash_free_result(sk, ctx);
-
 unlock:
+        hash_free_result(sk, ctx);
         release_sock(sk);
 
         return err ?: len;
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 156aad167cd6..954a64c7757b 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -137,7 +137,7 @@ static void dbg_dump_sg(const char *level, const char *prefix_str,
                 }
 
                 buf = it_page + it->offset;
-                len = min(tlen, it->length);
+                len = min_t(size_t, tlen, it->length);
                 print_hex_dump(level, prefix_str, prefix_type, rowsize,
                                groupsize, buf, len, ascii);
                 tlen -= len;
@@ -4583,6 +4583,15 @@ static int __init caam_algapi_init(void)
                 if (!aes_inst && (alg_sel == OP_ALG_ALGSEL_AES))
                                 continue;
 
+                /*
+                 * Check support for AES modes not available
+                 * on LP devices.
+                 */
+                if ((cha_vid & CHA_ID_LS_AES_MASK) == CHA_ID_LS_AES_LP)
+                        if ((alg->class1_alg_type & OP_ALG_AAI_MASK) ==
+                             OP_ALG_AAI_XTS)
+                                continue;
+
                 t_alg = caam_alg_alloc(alg);
                 if (IS_ERR(t_alg)) {
                         err = PTR_ERR(t_alg);