6 files changed, 47 insertions, 11 deletions

diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index d3a989e718f5..3cd6e12cfc46 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -141,7 +141,7 @@ int public_key_verify_signature(const struct public_key *pkey,
          * signature and returns that to us.
          */
         ret = crypto_akcipher_verify(req);
-        if (ret == -EINPROGRESS) {
+        if ((ret == -EINPROGRESS) || (ret == -EBUSY)) {
                 wait_for_completion(&compl.completion);
                 ret = compl.err;
         }
diff --git a/crypto/asymmetric_keys/verify_pefile.c b/crypto/asymmetric_keys/verify_pefile.c
index 672a94c2c3ff..d178650fd524 100644
--- a/crypto/asymmetric_keys/verify_pefile.c
+++ b/crypto/asymmetric_keys/verify_pefile.c
@@ -381,7 +381,7 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen,
         }
 
 error:
-        kfree(desc);
+        kzfree(desc);
 error_no_desc:
         crypto_free_shash(tfm);
         kleave(" = %d", ret);
@@ -450,6 +450,6 @@ int verify_pefile_signature(const void *pebuf, unsigned pelen,
         ret = pefile_digest_pe(pebuf, pelen, &ctx);
 
 error:
-        kfree(ctx.digest);
+        kzfree(ctx.digest);
         return ret;
 }
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index c80765b211cf..dd03fead1ca3 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -102,6 +102,7 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)
                 }
         }
 
+        ret = -ENOMEM;
         cert->pub->key = kmemdup(ctx->key, ctx->key_size, GFP_KERNEL);
         if (!cert->pub->key)
                 goto error_decode;
diff --git a/crypto/drbg.c b/crypto/drbg.c
index fa749f470135..cdb27ac4b226 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1767,9 +1767,8 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
                         break;
                 case -EINPROGRESS:
                 case -EBUSY:
-                        ret = wait_for_completion_interruptible(
-                                &drbg->ctr_completion);
-                        if (!ret && !drbg->ctr_async_err) {
+                        wait_for_completion(&drbg->ctr_completion);
+                        if (!drbg->ctr_async_err) {
                                 reinit_completion(&drbg->ctr_completion);
                                 break;
                         }
diff --git a/crypto/gcm.c b/crypto/gcm.c
index b7ad808be3d4..3841b5eafa7e 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -152,10 +152,8 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
 
         err = crypto_skcipher_encrypt(&data->req);
         if (err == -EINPROGRESS || err == -EBUSY) {
-                err = wait_for_completion_interruptible(
-                        &data->result.completion);
-                if (!err)
-                        err = data->result.err;
+                wait_for_completion(&data->result.completion);
+                err = data->result.err;
         }
 
         if (err)
diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 014af741fc6a..4faa0fd53b0c 100644
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -764,6 +764,44 @@ static int crypto_init_skcipher_ops_ablkcipher(struct crypto_tfm *tfm)
         return 0;
 }
 
+static int skcipher_setkey_unaligned(struct crypto_skcipher *tfm,
+                                     const u8 *key, unsigned int keylen)
+{
+        unsigned long alignmask = crypto_skcipher_alignmask(tfm);
+        struct skcipher_alg *cipher = crypto_skcipher_alg(tfm);
+        u8 *buffer, *alignbuffer;
+        unsigned long absize;
+        int ret;
+
+        absize = keylen + alignmask;
+        buffer = kmalloc(absize, GFP_ATOMIC);
+        if (!buffer)
+                return -ENOMEM;
+
+        alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
+        memcpy(alignbuffer, key, keylen);
+        ret = cipher->setkey(tfm, alignbuffer, keylen);
+        kzfree(buffer);
+        return ret;
+}
+
+static int skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,
+                           unsigned int keylen)
+{
+        struct skcipher_alg *cipher = crypto_skcipher_alg(tfm);
+        unsigned long alignmask = crypto_skcipher_alignmask(tfm);
+
+        if (keylen < cipher->min_keysize || keylen > cipher->max_keysize) {
+                crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+                return -EINVAL;
+        }
+
+        if ((unsigned long)key & alignmask)
+                return skcipher_setkey_unaligned(tfm, key, keylen);
+
+        return cipher->setkey(tfm, key, keylen);
+}
+
 static void crypto_skcipher_exit_tfm(struct crypto_tfm *tfm)
 {
         struct crypto_skcipher *skcipher = __crypto_skcipher_cast(tfm);
@@ -784,7 +822,7 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm)
             tfm->__crt_alg->cra_type == &crypto_givcipher_type)
                 return crypto_init_skcipher_ops_ablkcipher(tfm);
 
-        skcipher->setkey = alg->setkey;
+        skcipher->setkey = skcipher_setkey;
         skcipher->encrypt = alg->encrypt;
         skcipher->decrypt = alg->decrypt;
         skcipher->ivsize = alg->ivsize;