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

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.15:

  API:

   - Disambiguate EBUSY when queueing crypto request by adding ENOSPC.
     This change touches code outside the crypto API.
   - Reset settings when empty string is written to rng_current.

  Algorithms:

   - Add OSCCA SM3 secure hash.

  Drivers:

   - Remove old mv_cesa driver (replaced by marvell/cesa).
   - Enable rfc3686/ecb/cfb/ofb AES in crypto4xx.
   - Add ccm/gcm AES in crypto4xx.
   - Add support for BCM7278 in iproc-rng200.
   - Add hash support on Exynos in s5p-sss.
   - Fix fallback-induced error in vmx.
   - Fix output IV in atmel-aes.
   - Fix empty GCM hash in mediatek.

  Others:

   - Fix DoS potential in lib/mpi.
   - Fix potential out-of-order issues with padata"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (162 commits)
  lib/mpi: call cond_resched() from mpi_powm() loop
  crypto: stm32/hash - Fix return issue on update
  crypto: dh - Remove pointless checks for NULL 'p' and 'g'
  crypto: qat - Clean up error handling in qat_dh_set_secret()
  crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
  crypto: dh - Don't permit 'p' to be 0
  crypto: dh - Fix double free of ctx->p
  hwrng: iproc-rng200 - Add support for BCM7278
  dt-bindings: rng: Document BCM7278 RNG200 compatible
  crypto: chcr - Replace _manual_ swap with swap macro
  crypto: marvell - Add a NULL entry at the end of mv_cesa_plat_id_table[]
  hwrng: virtio - Virtio RNG devices need to be re-registered after suspend/resume
  crypto: atmel - remove empty functions
  crypto: ecdh - remove empty exit()
  MAINTAINERS: update maintainer for qat
  crypto: caam - remove unused param of ctx_map_to_sec4_sg()
  crypto: caam - remove unneeded edesc zeroization
  crypto: atmel-aes - Reset the controller before each use
  crypto: atmel-aes - properly set IV after {en,de}crypt
  hwrng: core - Reset user selected rng by writing "" to rng_current
  ...

2 files changed, 5 insertions, 30 deletions

diff --git a/drivers/crypto/qce/ablkcipher.c b/drivers/crypto/qce/ablkcipher.c
index b04b42f48366..ea4d96bf47e8 100644
--- a/drivers/crypto/qce/ablkcipher.c
+++ b/drivers/crypto/qce/ablkcipher.c
@@ -248,10 +248,7 @@ static int qce_ablkcipher_init(struct crypto_tfm *tfm)
         ctx->fallback = crypto_alloc_skcipher(crypto_tfm_alg_name(tfm), 0,
                                               CRYPTO_ALG_ASYNC |
                                               CRYPTO_ALG_NEED_FALLBACK);
-        if (IS_ERR(ctx->fallback))
-                return PTR_ERR(ctx->fallback);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(ctx->fallback);
 }
 
 static void qce_ablkcipher_exit(struct crypto_tfm *tfm)
diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
index 47e114ac09d0..53227d70d397 100644
--- a/drivers/crypto/qce/sha.c
+++ b/drivers/crypto/qce/sha.c
@@ -349,28 +349,12 @@ static int qce_ahash_digest(struct ahash_request *req)
         return qce->async_req_enqueue(tmpl->qce, &req->base);
 }
 
-struct qce_ahash_result {
-        struct completion completion;
-        int error;
-};
-
-static void qce_digest_complete(struct crypto_async_request *req, int error)
-{
-        struct qce_ahash_result *result = req->data;
-
-        if (error == -EINPROGRESS)
-                return;
-
-        result->error = error;
-        complete(&result->completion);
-}
-
 static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
                                  unsigned int keylen)
 {
         unsigned int digestsize = crypto_ahash_digestsize(tfm);
         struct qce_sha_ctx *ctx = crypto_tfm_ctx(&tfm->base);
-        struct qce_ahash_result result;
+        struct crypto_wait wait;
         struct ahash_request *req;
         struct scatterlist sg;
         unsigned int blocksize;
@@ -405,9 +389,9 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
                 goto err_free_ahash;
         }
 
-        init_completion(&result.completion);
+        crypto_init_wait(&wait);
         ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                   qce_digest_complete, &result);
+                                   crypto_req_done, &wait);
         crypto_ahash_clear_flags(ahash_tfm, ~0);
 
         buf = kzalloc(keylen + QCE_MAX_ALIGN_SIZE, GFP_KERNEL);
@@ -420,13 +404,7 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
         sg_init_one(&sg, buf, keylen);
         ahash_request_set_crypt(req, &sg, ctx->authkey, keylen);
 
-        ret = crypto_ahash_digest(req);
-        if (ret == -EINPROGRESS || ret == -EBUSY) {
-                ret = wait_for_completion_interruptible(&result.completion);
-                if (!ret)
-                        ret = result.error;
-        }
-
+        ret = crypto_wait_req(crypto_ahash_digest(req), &wait);
         if (ret)
                 crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);