11 files changed, 43 insertions, 41 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index b788f169cc98..b4ffc5be1a93 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -706,7 +706,7 @@ struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name,
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 8acb886032ae..9c1dc8d6106a 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -544,7 +544,8 @@ static int ahash_prepare_alg(struct ahash_alg *alg)
         struct crypto_alg *base = &alg->halg.base;
 
         if (alg->halg.digestsize > PAGE_SIZE / 8 ||
-            alg->halg.statesize > PAGE_SIZE / 8)
+            alg->halg.statesize > PAGE_SIZE / 8 ||
+            alg->halg.statesize == 0)
                 return -EINVAL;
 
         base->cra_type = &crypto_ahash_type;
diff --git a/crypto/algapi.c b/crypto/algapi.c
index d130b41dbaea..59bf491fe3d8 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -345,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
                 crypto_alg_tested(larval->alg.cra_driver_name, 0);
         }
 
-        err = wait_for_completion_interruptible(&larval->completion);
+        err = wait_for_completion_killable(&larval->completion);
         WARN_ON(err);
 
 out:
diff --git a/crypto/api.c b/crypto/api.c
index afe4610afc4b..bbc147cb5dec 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -172,7 +172,7 @@ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg)
         struct crypto_larval *larval = (void *)alg;
         long timeout;
 
-        timeout = wait_for_completion_interruptible_timeout(
+        timeout = wait_for_completion_killable_timeout(
                 &larval->completion, 60 * HZ);
 
         alg = larval->adult;
@@ -445,7 +445,7 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask)
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
@@ -562,7 +562,7 @@ void *crypto_alloc_tfm(const char *alg_name,
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
diff --git a/crypto/asymmetric_keys/asymmetric_keys.h b/crypto/asymmetric_keys/asymmetric_keys.h
index 3f5b537ab33e..1d450b580245 100644
--- a/crypto/asymmetric_keys/asymmetric_keys.h
+++ b/crypto/asymmetric_keys/asymmetric_keys.h
@@ -14,8 +14,3 @@ extern struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id);
 extern int __asymmetric_key_hex_to_key_id(const char *id,
                                           struct asymmetric_key_id *match_id,
                                           size_t hexlen);
-static inline
-const struct asymmetric_key_ids *asymmetric_key_ids(const struct key *key)
-{
-        return key->type_data.p[1];
-}
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index 1916680ad81b..9f2165b27d52 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -307,25 +307,34 @@ static int asymmetric_key_preparse(struct key_preparsed_payload *prep)
 }
 
 /*
+ * Clean up the key ID list
+ */
+static void asymmetric_key_free_kids(struct asymmetric_key_ids *kids)
+{
+        int i;
+
+        if (kids) {
+                for (i = 0; i < ARRAY_SIZE(kids->id); i++)
+                        kfree(kids->id[i]);
+                kfree(kids);
+        }
+}
+
+/*
  * Clean up the preparse data
  */
 static void asymmetric_key_free_preparse(struct key_preparsed_payload *prep)
 {
-        struct asymmetric_key_subtype *subtype = prep->type_data[0];
-        struct asymmetric_key_ids *kids = prep->type_data[1];
-        int i;
+        struct asymmetric_key_subtype *subtype = prep->payload.data[asym_subtype];
+        struct asymmetric_key_ids *kids = prep->payload.data[asym_key_ids];
 
         pr_devel("==>%s()\n", __func__);
 
         if (subtype) {
-                subtype->destroy(prep->payload[0]);
+                subtype->destroy(prep->payload.data[asym_crypto]);
                 module_put(subtype->owner);
         }
-        if (kids) {
-                for (i = 0; i < ARRAY_SIZE(kids->id); i++)
-                        kfree(kids->id[i]);
-                kfree(kids);
-        }
+        asymmetric_key_free_kids(kids);
         kfree(prep->description);
 }
 
@@ -335,20 +344,19 @@ static void asymmetric_key_free_preparse(struct key_preparsed_payload *prep)
 static void asymmetric_key_destroy(struct key *key)
 {
         struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
-        struct asymmetric_key_ids *kids = key->type_data.p[1];
+        struct asymmetric_key_ids *kids = key->payload.data[asym_key_ids];
+        void *data = key->payload.data[asym_crypto];
+
+        key->payload.data[asym_crypto] = NULL;
+        key->payload.data[asym_subtype] = NULL;
+        key->payload.data[asym_key_ids] = NULL;
 
         if (subtype) {
-                subtype->destroy(key->payload.data);
+                subtype->destroy(data);
                 module_put(subtype->owner);
-                key->type_data.p[0] = NULL;
         }
 
-        if (kids) {
-                kfree(kids->id[0]);
-                kfree(kids->id[1]);
-                kfree(kids);
-                key->type_data.p[1] = NULL;
-        }
+        asymmetric_key_free_kids(kids);
 }
 
 struct key_type key_type_asymmetric = {
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index 81efccbe22d5..6db4c01c6503 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -49,7 +49,7 @@ EXPORT_SYMBOL_GPL(pkey_id_type_name);
 static void public_key_describe(const struct key *asymmetric_key,
                                 struct seq_file *m)
 {
-        struct public_key *key = asymmetric_key->payload.data;
+        struct public_key *key = asymmetric_key->payload.data[asym_crypto];
 
         if (key)
                 seq_printf(m, "%s.%s",
@@ -112,7 +112,7 @@ EXPORT_SYMBOL_GPL(public_key_verify_signature);
 static int public_key_verify_signature_2(const struct key *key,
                                          const struct public_key_signature *sig)
 {
-        const struct public_key *pk = key->payload.data;
+        const struct public_key *pk = key->payload.data[asym_crypto];
         return public_key_verify_signature(pk, sig);
 }
 
diff --git a/crypto/asymmetric_keys/signature.c b/crypto/asymmetric_keys/signature.c
index 7525fd183574..9441240f7d2a 100644
--- a/crypto/asymmetric_keys/signature.c
+++ b/crypto/asymmetric_keys/signature.c
@@ -37,7 +37,7 @@ int verify_signature(const struct key *key,
                 return -EINVAL;
         subtype = asymmetric_key_subtype(key);
         if (!subtype ||
-            !key->payload.data)
+            !key->payload.data[0])
                 return -EINVAL;
         if (!subtype->verify_signature)
                 return -ENOTSUPP;
diff --git a/crypto/asymmetric_keys/x509_parser.h b/crypto/asymmetric_keys/x509_parser.h
index 1de01eaec884..dbeed6018e63 100644
--- a/crypto/asymmetric_keys/x509_parser.h
+++ b/crypto/asymmetric_keys/x509_parser.h
@@ -11,6 +11,7 @@
 
 #include <linux/time.h>
 #include <crypto/public_key.h>
+#include <keys/asymmetric-type.h>
 
 struct x509_certificate {
         struct x509_certificate *next;
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index 6451d1848a7d..2a44b3752471 100644
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -267,7 +267,8 @@ static int x509_validate_trust(struct x509_certificate *cert,
         if (!IS_ERR(key))  {
                 if (!use_builtin_keys
                     || test_bit(KEY_FLAG_BUILTIN, &key->flags))
-                        ret = x509_check_signature(key->payload.data, cert);
+                        ret = x509_check_signature(key->payload.data[asym_crypto],
+                                                   cert);
                 key_put(key);
         }
         return ret;
@@ -333,10 +334,6 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
                 srlen = cert->raw_serial_size;
                 q = cert->raw_serial;
         }
-        if (srlen > 1 && *q == 0) {
-                srlen--;
-                q++;
-        }
 
         ret = -ENOMEM;
         desc = kmalloc(sulen + 2 + srlen * 2 + 1, GFP_KERNEL);
@@ -357,9 +354,9 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
 
         /* We're pinning the module by being linked against it */
         __module_get(public_key_subtype.owner);
-        prep->type_data[0] = &public_key_subtype;
-        prep->type_data[1] = kids;
-        prep->payload[0] = cert->pub;
+        prep->payload.data[asym_subtype] = &public_key_subtype;
+        prep->payload.data[asym_key_ids] = kids;
+        prep->payload.data[asym_crypto] = cert->pub;
         prep->description = desc;
         prep->quotalen = 100;
 
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index d94d99ffe8b9..237f3795cfaa 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -375,7 +375,7 @@ static struct crypto_alg *crypto_user_skcipher_alg(const char *name, u32 type,
                 err = PTR_ERR(alg);
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }