11 files changed, 27 insertions, 59 deletions

diff --git a/crypto/aead.c b/crypto/aead.c
index 0b8121ebec07..4d04e12ffde8 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -282,18 +282,16 @@ struct crypto_instance *aead_geniv_alloc(struct crypto_template *tmpl,
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ (CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_GENIV)) &
             algt->mask)
                 return ERR_PTR(-EINVAL);
 
         name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(name);
         if (IS_ERR(name))
-                return ERR_PTR(err);
+                return ERR_CAST(name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)
diff --git a/crypto/algapi.c b/crypto/algapi.c
index c3b9bfeeb7ff..08c57c8aec95 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -749,12 +749,10 @@ struct crypto_alg *crypto_attr_alg2(struct rtattr *rta,
                                     u32 type, u32 mask)
 {
         const char *name;
-        int err;
 
         name = crypto_attr_alg_name(rta);
-        err = PTR_ERR(name);
         if (IS_ERR(name))
-                return ERR_PTR(err);
+                return ERR_CAST(name);
 
         return crypto_find_alg(name, frontend, type, mask);
 }
diff --git a/crypto/authenc.c b/crypto/authenc.c
index d0583a4489e6..ffce19de05cf 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -592,9 +592,8 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 136b68b9d8d4..ab53762fc309 100644
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -715,9 +715,8 @@ static struct crypto_instance *crypto_authenc_esn_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index a8d85a1d670e..e9e7244d5ef5 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -588,18 +588,16 @@ struct crypto_instance *skcipher_geniv_alloc(struct crypto_template *tmpl,
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ (CRYPTO_ALG_TYPE_GIVCIPHER | CRYPTO_ALG_GENIV)) &
             algt->mask)
                 return ERR_PTR(-EINVAL);
 
         name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(name);
         if (IS_ERR(name))
-                return ERR_PTR(err);
+                return ERR_CAST(name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 32fe1bb5decb..499c91717d93 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -484,18 +484,16 @@ static struct crypto_instance *crypto_ccm_alloc_common(struct rtattr **tb,
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         cipher = crypto_alg_mod_lookup(cipher_name,  CRYPTO_ALG_TYPE_CIPHER,
                                        CRYPTO_ALG_TYPE_MASK);
-        err = PTR_ERR(cipher);
         if (IS_ERR(cipher))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher);
 
         err = -EINVAL;
         if (cipher->cra_blocksize != 16)
@@ -573,15 +571,13 @@ out_put_cipher:
 
 static struct crypto_instance *crypto_ccm_alloc(struct rtattr **tb)
 {
-        int err;
         const char *cipher_name;
         char ctr_name[CRYPTO_MAX_ALG_NAME];
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         cipher_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(cipher_name);
         if (IS_ERR(cipher_name))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher_name);
 
         if (snprintf(ctr_name, CRYPTO_MAX_ALG_NAME, "ctr(%s)",
                      cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -612,20 +608,17 @@ static struct crypto_template crypto_ccm_tmpl = {
 
 static struct crypto_instance *crypto_ccm_base_alloc(struct rtattr **tb)
 {
-        int err;
         const char *ctr_name;
         const char *cipher_name;
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         ctr_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ctr_name);
         if (IS_ERR(ctr_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ctr_name);
 
         cipher_name = crypto_attr_alg_name(tb[2]);
-        err = PTR_ERR(cipher_name);
         if (IS_ERR(cipher_name))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher_name);
 
         if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "ccm_base(%s,%s)",
                      ctr_name, cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -760,17 +753,15 @@ static struct crypto_instance *crypto_rfc4309_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         ccm_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ccm_name);
         if (IS_ERR(ccm_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ccm_name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)
diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index ba200b07449d..834d8dd3d4fc 100644
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -291,9 +291,8 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         err = crypto_get_default_rng();
         if (err)
diff --git a/crypto/ctr.c b/crypto/ctr.c
index 4ca7222cfeb6..095dcb66d72d 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -334,9 +334,8 @@ static struct crypto_instance *crypto_rfc3686_alloc(struct rtattr **tb)
 
         alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_BLKCIPHER,
                                   CRYPTO_ALG_TYPE_MASK);
-        err = PTR_ERR(alg);
         if (IS_ERR(alg))
-                return ERR_PTR(err);
+                return ERR_CAST(alg);
 
         /* We only support 16-byte blocks. */
         err = -EINVAL;
diff --git a/crypto/cts.c b/crypto/cts.c
index ccf9c5de3958..042223f8e733 100644
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -282,9 +282,8 @@ static struct crypto_instance *crypto_cts_alloc(struct rtattr **tb)
 
         alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_BLKCIPHER,
                                   CRYPTO_ALG_TYPE_MASK);
-        err = PTR_ERR(alg);
         if (IS_ERR(alg))
-                return ERR_PTR(err);
+                return ERR_CAST(alg);
 
         inst = ERR_PTR(-EINVAL);
         if (!is_power_of_2(alg->cra_blocksize))
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 1a252639ef91..137ad1ec5438 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -701,9 +701,8 @@ static struct crypto_instance *crypto_gcm_alloc_common(struct rtattr **tb,
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
@@ -711,9 +710,8 @@ static struct crypto_instance *crypto_gcm_alloc_common(struct rtattr **tb,
         ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
                                     CRYPTO_ALG_TYPE_HASH,
                                     CRYPTO_ALG_TYPE_AHASH_MASK);
-        err = PTR_ERR(ghash_alg);
         if (IS_ERR(ghash_alg))
-                return ERR_PTR(err);
+                return ERR_CAST(ghash_alg);
 
         err = -ENOMEM;
         inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
@@ -787,15 +785,13 @@ out_put_ghash:
 
 static struct crypto_instance *crypto_gcm_alloc(struct rtattr **tb)
 {
-        int err;
         const char *cipher_name;
         char ctr_name[CRYPTO_MAX_ALG_NAME];
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         cipher_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(cipher_name);
         if (IS_ERR(cipher_name))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher_name);
 
         if (snprintf(ctr_name, CRYPTO_MAX_ALG_NAME, "ctr(%s)", cipher_name) >=
             CRYPTO_MAX_ALG_NAME)
@@ -826,20 +822,17 @@ static struct crypto_template crypto_gcm_tmpl = {
 
 static struct crypto_instance *crypto_gcm_base_alloc(struct rtattr **tb)
 {
-        int err;
         const char *ctr_name;
         const char *ghash_name;
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         ctr_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ctr_name);
         if (IS_ERR(ctr_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ctr_name);
 
         ghash_name = crypto_attr_alg_name(tb[2]);
-        err = PTR_ERR(ghash_name);
         if (IS_ERR(ghash_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ghash_name);
 
         if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "gcm_base(%s,%s)",
                      ctr_name, ghash_name) >= CRYPTO_MAX_ALG_NAME)
@@ -971,17 +964,15 @@ static struct crypto_instance *crypto_rfc4106_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         ccm_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ccm_name);
         if (IS_ERR(ccm_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ccm_name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)
@@ -1222,17 +1213,15 @@ static struct crypto_instance *crypto_rfc4543_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         ccm_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ccm_name);
         if (IS_ERR(ccm_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ccm_name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)
diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 4c4491229417..f2cba4ed6f25 100644
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -305,9 +305,8 @@ static struct crypto_instance *seqiv_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         err = crypto_get_default_rng();
         if (err)