28 files changed, 427 insertions, 190 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4641d95651d3..05c0ce52f96d 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -134,8 +134,8 @@ config CRYPTO_NULL
           These are 'Null' algorithms, used by IPsec, which do nothing.
 
 config CRYPTO_PCRYPT
-        tristate "Parallel crypto engine (EXPERIMENTAL)"
-        depends on SMP && EXPERIMENTAL
+        tristate "Parallel crypto engine"
+        depends on SMP
         select PADATA
         select CRYPTO_MANAGER
         select CRYPTO_AEAD
@@ -292,7 +292,6 @@ config CRYPTO_HMAC
 
 config CRYPTO_XCBC
         tristate "XCBC support"
-        depends on EXPERIMENTAL
         select CRYPTO_HASH
         select CRYPTO_MANAGER
         help
@@ -303,7 +302,6 @@ config CRYPTO_XCBC
 
 config CRYPTO_VMAC
         tristate "VMAC support"
-        depends on EXPERIMENTAL
         select CRYPTO_HASH
         select CRYPTO_MANAGER
         help
@@ -355,6 +353,27 @@ config CRYPTO_CRC32C_SPARC64
           CRC32c CRC algorithm implemented using sparc64 crypto instructions,
           when available.
 
+config CRYPTO_CRC32
+        tristate "CRC32 CRC algorithm"
+        select CRYPTO_HASH
+        select CRC32
+        help
+          CRC-32-IEEE 802.3 cyclic redundancy-check algorithm.
+          Shash crypto api wrappers to crc32_le function.
+
+config CRYPTO_CRC32_PCLMUL
+        tristate "CRC32 PCLMULQDQ hardware acceleration"
+        depends on X86
+        select CRYPTO_HASH
+        select CRC32
+        help
+          From Intel Westmere and AMD Bulldozer processor with SSE4.2
+          and PCLMULQDQ supported, the processor will support
+          CRC32 PCLMULQDQ implementation using hardware accelerated PCLMULQDQ
+          instruction. This option will create 'crc32-plcmul' module,
+          which will enable any routine to use the CRC-32-IEEE 802.3 checksum
+          and gain better performance as compared with the table implementation.
+
 config CRYPTO_GHASH
         tristate "GHASH digest algorithm"
         select CRYPTO_GF128MUL
@@ -479,6 +498,13 @@ config CRYPTO_SHA1_ARM
           SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
           using optimized ARM assembler.
 
+config CRYPTO_SHA1_PPC
+        tristate "SHA1 digest algorithm (powerpc)"
+        depends on PPC
+        help
+          This is the powerpc hardware accelerated implementation of the
+          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
+
 config CRYPTO_SHA256
         tristate "SHA224 and SHA256 digest algorithm"
         select CRYPTO_HASH
@@ -932,8 +958,7 @@ config CRYPTO_KHAZAD
           <http://www.larc.usp.br/~pbarreto/KhazadPage.html>
 
 config CRYPTO_SALSA20
-        tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "Salsa20 stream cipher algorithm"
         select CRYPTO_BLKCIPHER
         help
           Salsa20 stream cipher algorithm.
@@ -945,9 +970,8 @@ config CRYPTO_SALSA20
           Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
 
 config CRYPTO_SALSA20_586
-        tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)"
+        tristate "Salsa20 stream cipher algorithm (i586)"
         depends on (X86 || UML_X86) && !64BIT
-        depends on EXPERIMENTAL
         select CRYPTO_BLKCIPHER
         help
           Salsa20 stream cipher algorithm.
@@ -959,9 +983,8 @@ config CRYPTO_SALSA20_586
           Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
 
 config CRYPTO_SALSA20_X86_64
-        tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)"
+        tristate "Salsa20 stream cipher algorithm (x86_64)"
         depends on (X86 || UML_X86) && 64BIT
-        depends on EXPERIMENTAL
         select CRYPTO_BLKCIPHER
         help
           Salsa20 stream cipher algorithm.
diff --git a/crypto/Makefile b/crypto/Makefile
index d59dec749804..be1a1bebbb86 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -81,6 +81,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
 obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o
 obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
 obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+obj-$(CONFIG_CRYPTO_CRC32) += crc32.o
 obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
 obj-$(CONFIG_CRYPTO_LZO) += lzo.o
 obj-$(CONFIG_CRYPTO_842) += 842.o
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 533de9550a82..7d4a8d28277e 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -388,9 +388,9 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_blkcipher rblkcipher;
 
-        snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "ablkcipher");
-        snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s",
-                 alg->cra_ablkcipher.geniv ?: "<default>");
+        strncpy(rblkcipher.type, "ablkcipher", sizeof(rblkcipher.type));
+        strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
+                sizeof(rblkcipher.geniv));
 
         rblkcipher.blocksize = alg->cra_blocksize;
         rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
@@ -469,9 +469,9 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_blkcipher rblkcipher;
 
-        snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "givcipher");
-        snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s",
-                 alg->cra_ablkcipher.geniv ?: "<built-in>");
+        strncpy(rblkcipher.type, "givcipher", sizeof(rblkcipher.type));
+        strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<built-in>",
+                sizeof(rblkcipher.geniv));
 
         rblkcipher.blocksize = alg->cra_blocksize;
         rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
diff --git a/crypto/aead.c b/crypto/aead.c
index 0b8121ebec07..547491e35c63 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -117,9 +117,8 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
         struct crypto_report_aead raead;
         struct aead_alg *aead = &alg->cra_aead;
 
-        snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "aead");
-        snprintf(raead.geniv, CRYPTO_MAX_ALG_NAME, "%s",
-                 aead->geniv ?: "<built-in>");
+        strncpy(raead.type, "aead", sizeof(raead.type));
+        strncpy(raead.geniv, aead->geniv ?: "<built-in>", sizeof(raead.geniv));
 
         raead.blocksize = alg->cra_blocksize;
         raead.maxauthsize = aead->maxauthsize;
@@ -203,8 +202,8 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
         struct crypto_report_aead raead;
         struct aead_alg *aead = &alg->cra_aead;
 
-        snprintf(raead.type, CRYPTO_MAX_ALG_NAME, "%s", "nivaead");
-        snprintf(raead.geniv, CRYPTO_MAX_ALG_NAME, "%s", aead->geniv);
+        strncpy(raead.type, "nivaead", sizeof(raead.type));
+        strncpy(raead.geniv, aead->geniv, sizeof(raead.geniv));
 
         raead.blocksize = alg->cra_blocksize;
         raead.maxauthsize = aead->maxauthsize;
@@ -282,18 +281,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/ahash.c b/crypto/ahash.c
index 3887856c2dd6..793a27f2493e 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -404,7 +404,7 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_hash rhash;
 
-        snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "ahash");
+        strncpy(rhash.type, "ahash", sizeof(rhash.type));
 
         rhash.blocksize = alg->cra_blocksize;
         rhash.digestsize = __crypto_hash_alg_common(alg)->digestsize;
diff --git a/crypto/algapi.c b/crypto/algapi.c
index c3b9bfeeb7ff..6149a6e09643 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -447,7 +447,7 @@ EXPORT_SYMBOL_GPL(crypto_register_template);
 void crypto_unregister_template(struct crypto_template *tmpl)
 {
         struct crypto_instance *inst;
-        struct hlist_node *p, *n;
+        struct hlist_node *n;
         struct hlist_head *list;
         LIST_HEAD(users);
 
@@ -457,7 +457,7 @@ void crypto_unregister_template(struct crypto_template *tmpl)
         list_del_init(&tmpl->list);
 
         list = &tmpl->instances;
-        hlist_for_each_entry(inst, p, list, list) {
+        hlist_for_each_entry(inst, list, list) {
                 int err = crypto_remove_alg(&inst->alg, &users);
                 BUG_ON(err);
         }
@@ -466,7 +466,7 @@ void crypto_unregister_template(struct crypto_template *tmpl)
 
         up_write(&crypto_alg_sem);
 
-        hlist_for_each_entry_safe(inst, p, n, list, list) {
+        hlist_for_each_entry_safe(inst, n, list, list) {
                 BUG_ON(atomic_read(&inst->alg.cra_refcnt) != 1);
                 tmpl->free(inst);
         }
@@ -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/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 361b5e8239bc..9e62feffb374 100644
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -67,6 +67,12 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
 
                 tx = device->device_prep_dma_memcpy(chan, dma_dest, dma_src,
                                                     len, dma_prep_flags);
+                if (!tx) {
+                        dma_unmap_page(device->dev, dma_dest, len,
+                                       DMA_FROM_DEVICE);
+                        dma_unmap_page(device->dev, dma_src, len,
+                                       DMA_TO_DEVICE);
+                }
         }
 
         if (tx) {
diff --git a/crypto/async_tx/async_memset.c b/crypto/async_tx/async_memset.c
index 58e4a8752aee..05a4d1e00148 100644
--- a/crypto/async_tx/async_memset.c
+++ b/crypto/async_tx/async_memset.c
@@ -25,6 +25,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/async_tx.h>
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index 842120979374..7be34248b450 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -128,8 +128,8 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx,
                 }
                 device->device_issue_pending(chan);
         } else {
-                if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
-                        panic("%s: DMA_ERROR waiting for depend_tx\n",
+                if (dma_wait_for_async_tx(depend_tx) != DMA_SUCCESS)
+                        panic("%s: DMA error waiting for depend_tx\n",
                               __func__);
                 tx->tx_submit(tx);
         }
@@ -280,8 +280,9 @@ void async_tx_quiesce(struct dma_async_tx_descriptor **tx)
                  * we are referring to the correct operation
                  */
                 BUG_ON(async_tx_test_ack(*tx));
-                if (dma_wait_for_async_tx(*tx) == DMA_ERROR)
-                        panic("DMA_ERROR waiting for transaction\n");
+                if (dma_wait_for_async_tx(*tx) != DMA_SUCCESS)
+                        panic("%s: DMA error waiting for transaction\n",
+                              __func__);
                 async_tx_ack(*tx);
                 *tx = NULL;
         }
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 154cc84381c2..8ade0a0481c6 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -230,9 +230,7 @@ EXPORT_SYMBOL_GPL(async_xor);
 
 static int page_is_zero(struct page *p, unsigned int offset, size_t len)
 {
-        char *a = page_address(p) + offset;
-        return ((*(u32 *) a) == 0 &&
-                memcmp(a, a + 4, len - 4) == 0);
+        return !memchr_inv(page_address(p) + offset, 0, len);
 }
 
 static inline struct dma_chan *
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..a79e7e9ab86e 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -499,9 +499,9 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_blkcipher rblkcipher;
 
-        snprintf(rblkcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "blkcipher");
-        snprintf(rblkcipher.geniv, CRYPTO_MAX_ALG_NAME, "%s",
-                 alg->cra_blkcipher.geniv ?: "<default>");
+        strncpy(rblkcipher.type, "blkcipher", sizeof(rblkcipher.type));
+        strncpy(rblkcipher.geniv, alg->cra_blkcipher.geniv ?: "<default>",
+                sizeof(rblkcipher.geniv));
 
         rblkcipher.blocksize = alg->cra_blocksize;
         rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
@@ -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/crc32.c b/crypto/crc32.c
new file mode 100644
index 000000000000..9d1c41569898
--- /dev/null
+++ b/crypto/crc32.c
@@ -0,0 +1,158 @@
+/* GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see http://www.gnu.org/licenses
+ *
+ * Please  visit http://www.xyratex.com/contact if you need additional
+ * information or have any questions.
+ *
+ * GPL HEADER END
+ */
+
+/*
+ * Copyright 2012 Xyratex Technology Limited
+ */
+
+/*
+ * This is crypto api shash wrappers to crc32_le.
+ */
+
+#include <linux/crc32.h>
+#include <crypto/internal/hash.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+
+#define CHKSUM_BLOCK_SIZE       1
+#define CHKSUM_DIGEST_SIZE      4
+
+static u32 __crc32_le(u32 crc, unsigned char const *p, size_t len)
+{
+        return crc32_le(crc, p, len);
+}
+
+/** No default init with ~0 */
+static int crc32_cra_init(struct crypto_tfm *tfm)
+{
+        u32 *key = crypto_tfm_ctx(tfm);
+
+        *key = 0;
+
+        return 0;
+}
+
+
+/*
+ * Setting the seed allows arbitrary accumulators and flexible XOR policy
+ * If your algorithm starts with ~0, then XOR with ~0 before you set
+ * the seed.
+ */
+static int crc32_setkey(struct crypto_shash *hash, const u8 *key,
+                        unsigned int keylen)
+{
+        u32 *mctx = crypto_shash_ctx(hash);
+
+        if (keylen != sizeof(u32)) {
+                crypto_shash_set_flags(hash, CRYPTO_TFM_RES_BAD_KEY_LEN);
+                return -EINVAL;
+        }
+        *mctx = le32_to_cpup((__le32 *)key);
+        return 0;
+}
+
+static int crc32_init(struct shash_desc *desc)
+{
+        u32 *mctx = crypto_shash_ctx(desc->tfm);
+        u32 *crcp = shash_desc_ctx(desc);
+
+        *crcp = *mctx;
+
+        return 0;
+}
+
+static int crc32_update(struct shash_desc *desc, const u8 *data,
+                        unsigned int len)
+{
+        u32 *crcp = shash_desc_ctx(desc);
+
+        *crcp = __crc32_le(*crcp, data, len);
+        return 0;
+}
+
+/* No final XOR 0xFFFFFFFF, like crc32_le */
+static int __crc32_finup(u32 *crcp, const u8 *data, unsigned int len,
+                         u8 *out)
+{
+        *(__le32 *)out = cpu_to_le32(__crc32_le(*crcp, data, len));
+        return 0;
+}
+
+static int crc32_finup(struct shash_desc *desc, const u8 *data,
+                       unsigned int len, u8 *out)
+{
+        return __crc32_finup(shash_desc_ctx(desc), data, len, out);
+}
+
+static int crc32_final(struct shash_desc *desc, u8 *out)
+{
+        u32 *crcp = shash_desc_ctx(desc);
+
+        *(__le32 *)out = cpu_to_le32p(crcp);
+        return 0;
+}
+
+static int crc32_digest(struct shash_desc *desc, const u8 *data,
+                        unsigned int len, u8 *out)
+{
+        return __crc32_finup(crypto_shash_ctx(desc->tfm), data, len,
+                             out);
+}
+static struct shash_alg alg = {
+        .setkey         = crc32_setkey,
+        .init           = crc32_init,
+        .update         = crc32_update,
+        .final          = crc32_final,
+        .finup          = crc32_finup,
+        .digest         = crc32_digest,
+        .descsize       = sizeof(u32),
+        .digestsize     = CHKSUM_DIGEST_SIZE,
+        .base           = {
+                .cra_name               = "crc32",
+                .cra_driver_name        = "crc32-table",
+                .cra_priority           = 100,
+                .cra_blocksize          = CHKSUM_BLOCK_SIZE,
+                .cra_ctxsize            = sizeof(u32),
+                .cra_module             = THIS_MODULE,
+                .cra_init               = crc32_cra_init,
+        }
+};
+
+static int __init crc32_mod_init(void)
+{
+        return crypto_register_shash(&alg);
+}
+
+static void __exit crc32_mod_fini(void)
+{
+        crypto_unregister_shash(&alg);
+}
+
+module_init(crc32_mod_init);
+module_exit(crc32_mod_fini);
+
+MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");
+MODULE_DESCRIPTION("CRC32 calculations wrapper for lib/crc32");
+MODULE_LICENSE("GPL");
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index 35d700a97d79..dfd511fb39ee 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -30,6 +30,8 @@
 
 #include "internal.h"
 
+#define null_terminated(x)      (strnlen(x, sizeof(x)) < sizeof(x))
+
 static DEFINE_MUTEX(crypto_cfg_mutex);
 
 /* The crypto netlink socket */
@@ -75,7 +77,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_cipher rcipher;
 
-        snprintf(rcipher.type, CRYPTO_MAX_ALG_NAME, "%s", "cipher");
+        strncpy(rcipher.type, "cipher", sizeof(rcipher.type));
 
         rcipher.blocksize = alg->cra_blocksize;
         rcipher.min_keysize = alg->cra_cipher.cia_min_keysize;
@@ -94,8 +96,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_comp rcomp;
 
-        snprintf(rcomp.type, CRYPTO_MAX_ALG_NAME, "%s", "compression");
-
+        strncpy(rcomp.type, "compression", sizeof(rcomp.type));
         if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,
                     sizeof(struct crypto_report_comp), &rcomp))
                 goto nla_put_failure;
@@ -108,12 +109,14 @@ nla_put_failure:
 static int crypto_report_one(struct crypto_alg *alg,
                              struct crypto_user_alg *ualg, struct sk_buff *skb)
 {
-        memcpy(&ualg->cru_name, &alg->cra_name, sizeof(ualg->cru_name));
-        memcpy(&ualg->cru_driver_name, &alg->cra_driver_name,
-               sizeof(ualg->cru_driver_name));
-        memcpy(&ualg->cru_module_name, module_name(alg->cra_module),
-               CRYPTO_MAX_ALG_NAME);
-
+        strncpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
+        strncpy(ualg->cru_driver_name, alg->cra_driver_name,
+                sizeof(ualg->cru_driver_name));
+        strncpy(ualg->cru_module_name, module_name(alg->cra_module),
+                sizeof(ualg->cru_module_name));
+
+        ualg->cru_type = 0;
+        ualg->cru_mask = 0;
         ualg->cru_flags = alg->cra_flags;
         ualg->cru_refcnt = atomic_read(&alg->cra_refcnt);
 
@@ -122,8 +125,7 @@ static int crypto_report_one(struct crypto_alg *alg,
         if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
                 struct crypto_report_larval rl;
 
-                snprintf(rl.type, CRYPTO_MAX_ALG_NAME, "%s", "larval");
-
+                strncpy(rl.type, "larval", sizeof(rl.type));
                 if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL,
                             sizeof(struct crypto_report_larval), &rl))
                         goto nla_put_failure;
@@ -196,7 +198,10 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
         struct crypto_dump_info info;
         int err;
 
-        if (!p->cru_driver_name)
+        if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
+                return -EINVAL;
+
+        if (!p->cru_driver_name[0])
                 return -EINVAL;
 
         alg = crypto_alg_match(p, 1);
@@ -260,6 +265,9 @@ static int crypto_update_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
         LIST_HEAD(list);
 
+        if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
+                return -EINVAL;
+
         if (priority && !strlen(p->cru_driver_name))
                 return -EINVAL;
 
@@ -287,6 +295,9 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct crypto_alg *alg;
         struct crypto_user_alg *p = nlmsg_data(nlh);
 
+        if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
+                return -EINVAL;
+
         alg = crypto_alg_match(p, 1);
         if (!alg)
                 return -ENOENT;
@@ -368,6 +379,9 @@ static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct crypto_user_alg *p = nlmsg_data(nlh);
         struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
 
+        if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
+                return -EINVAL;
+
         if (strlen(p->cru_driver_name))
                 exact = 1;
 
diff --git a/crypto/ctr.c b/crypto/ctr.c
index 4ca7222cfeb6..f2b94f27bb2c 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -12,6 +12,7 @@
 
 #include <crypto/algapi.h>
 #include <crypto/ctr.h>
+#include <crypto/internal/skcipher.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -25,10 +26,15 @@ struct crypto_ctr_ctx {
 };
 
 struct crypto_rfc3686_ctx {
-        struct crypto_blkcipher *child;
+        struct crypto_ablkcipher *child;
         u8 nonce[CTR_RFC3686_NONCE_SIZE];
 };
 
+struct crypto_rfc3686_req_ctx {
+        u8 iv[CTR_RFC3686_BLOCK_SIZE];
+        struct ablkcipher_request subreq CRYPTO_MINALIGN_ATTR;
+};
+
 static int crypto_ctr_setkey(struct crypto_tfm *parent, const u8 *key,
                              unsigned int keylen)
 {
@@ -243,11 +249,11 @@ static struct crypto_template crypto_ctr_tmpl = {
         .module = THIS_MODULE,
 };
 
-static int crypto_rfc3686_setkey(struct crypto_tfm *parent, const u8 *key,
-                                 unsigned int keylen)
+static int crypto_rfc3686_setkey(struct crypto_ablkcipher *parent,
+                                 const u8 *key, unsigned int keylen)
 {
-        struct crypto_rfc3686_ctx *ctx = crypto_tfm_ctx(parent);
-        struct crypto_blkcipher *child = ctx->child;
+        struct crypto_rfc3686_ctx *ctx = crypto_ablkcipher_ctx(parent);
+        struct crypto_ablkcipher *child = ctx->child;
         int err;
 
         /* the nonce is stored in bytes at end of key */
@@ -259,59 +265,64 @@ static int crypto_rfc3686_setkey(struct crypto_tfm *parent, const u8 *key,
 
         keylen -= CTR_RFC3686_NONCE_SIZE;
 
-        crypto_blkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-        crypto_blkcipher_set_flags(child, crypto_tfm_get_flags(parent) &
-                                          CRYPTO_TFM_REQ_MASK);
-        err = crypto_blkcipher_setkey(child, key, keylen);
-        crypto_tfm_set_flags(parent, crypto_blkcipher_get_flags(child) &
-                                     CRYPTO_TFM_RES_MASK);
+        crypto_ablkcipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
+        crypto_ablkcipher_set_flags(child, crypto_ablkcipher_get_flags(parent) &
+                                    CRYPTO_TFM_REQ_MASK);
+        err = crypto_ablkcipher_setkey(child, key, keylen);
+        crypto_ablkcipher_set_flags(parent, crypto_ablkcipher_get_flags(child) &
+                                    CRYPTO_TFM_RES_MASK);
 
         return err;
 }
 
-static int crypto_rfc3686_crypt(struct blkcipher_desc *desc,
-                                struct scatterlist *dst,
-                                struct scatterlist *src, unsigned int nbytes)
+static int crypto_rfc3686_crypt(struct ablkcipher_request *req)
 {
-        struct crypto_blkcipher *tfm = desc->tfm;
-        struct crypto_rfc3686_ctx *ctx = crypto_blkcipher_ctx(tfm);
-        struct crypto_blkcipher *child = ctx->child;
-        unsigned long alignmask = crypto_blkcipher_alignmask(tfm);
-        u8 ivblk[CTR_RFC3686_BLOCK_SIZE + alignmask];
-        u8 *iv = PTR_ALIGN(ivblk + 0, alignmask + 1);
-        u8 *info = desc->info;
-        int err;
+        struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);
+        struct crypto_rfc3686_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+        struct crypto_ablkcipher *child = ctx->child;
+        unsigned long align = crypto_ablkcipher_alignmask(tfm);
+        struct crypto_rfc3686_req_ctx *rctx =
+                (void *)PTR_ALIGN((u8 *)ablkcipher_request_ctx(req), align + 1);
+        struct ablkcipher_request *subreq = &rctx->subreq;
+        u8 *iv = rctx->iv;
 
         /* set up counter block */
         memcpy(iv, ctx->nonce, CTR_RFC3686_NONCE_SIZE);
-        memcpy(iv + CTR_RFC3686_NONCE_SIZE, info, CTR_RFC3686_IV_SIZE);
+        memcpy(iv + CTR_RFC3686_NONCE_SIZE, req->info, CTR_RFC3686_IV_SIZE);
 
         /* initialize counter portion of counter block */
         *(__be32 *)(iv + CTR_RFC3686_NONCE_SIZE + CTR_RFC3686_IV_SIZE) =
                 cpu_to_be32(1);
 
-        desc->tfm = child;
-        desc->info = iv;
-        err = crypto_blkcipher_encrypt_iv(desc, dst, src, nbytes);
-        desc->tfm = tfm;
-        desc->info = info;
+        ablkcipher_request_set_tfm(subreq, child);
+        ablkcipher_request_set_callback(subreq, req->base.flags,
+                                        req->base.complete, req->base.data);
+        ablkcipher_request_set_crypt(subreq, req->src, req->dst, req->nbytes,
+                                     iv);
 
-        return err;
+        return crypto_ablkcipher_encrypt(subreq);
 }
 
 static int crypto_rfc3686_init_tfm(struct crypto_tfm *tfm)
 {
         struct crypto_instance *inst = (void *)tfm->__crt_alg;
-        struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+        struct crypto_skcipher_spawn *spawn = crypto_instance_ctx(inst);
         struct crypto_rfc3686_ctx *ctx = crypto_tfm_ctx(tfm);
-        struct crypto_blkcipher *cipher;
+        struct crypto_ablkcipher *cipher;
+        unsigned long align;
 
-        cipher = crypto_spawn_blkcipher(spawn);
+        cipher = crypto_spawn_skcipher(spawn);
         if (IS_ERR(cipher))
                 return PTR_ERR(cipher);
 
         ctx->child = cipher;
 
+        align = crypto_tfm_alg_alignmask(tfm);
+        align &= ~(crypto_tfm_ctx_alignment() - 1);
+        tfm->crt_ablkcipher.reqsize = align +
+                sizeof(struct crypto_rfc3686_req_ctx) +
+                crypto_ablkcipher_reqsize(cipher);
+
         return 0;
 }
 
@@ -319,74 +330,108 @@ static void crypto_rfc3686_exit_tfm(struct crypto_tfm *tfm)
 {
         struct crypto_rfc3686_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypto_free_blkcipher(ctx->child);
+        crypto_free_ablkcipher(ctx->child);
 }
 
 static struct crypto_instance *crypto_rfc3686_alloc(struct rtattr **tb)
 {
+        struct crypto_attr_type *algt;
         struct crypto_instance *inst;
         struct crypto_alg *alg;
+        struct crypto_skcipher_spawn *spawn;
+        const char *cipher_name;
         int err;
 
-        err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);
+        algt = crypto_get_attr_type(tb);
+        if (IS_ERR(algt))
+                return ERR_CAST(algt);
+
+        if ((algt->type ^ CRYPTO_ALG_TYPE_BLKCIPHER) & algt->mask)
+                return ERR_PTR(-EINVAL);
+
+        cipher_name = crypto_attr_alg_name(tb[1]);
+        if (IS_ERR(cipher_name))
+                return ERR_CAST(cipher_name);
+
+        inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
+        if (!inst)
+                return ERR_PTR(-ENOMEM);
+
+        spawn = crypto_instance_ctx(inst);
+
+        crypto_set_skcipher_spawn(spawn, inst);
+        err = crypto_grab_skcipher(spawn, cipher_name, 0,
+                                   crypto_requires_sync(algt->type,
+                                                        algt->mask));
         if (err)
-                return ERR_PTR(err);
+                goto err_free_inst;
 
-        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);
+        alg = crypto_skcipher_spawn_alg(spawn);
 
         /* We only support 16-byte blocks. */
         err = -EINVAL;
-        if (alg->cra_blkcipher.ivsize != CTR_RFC3686_BLOCK_SIZE)
-                goto out_put_alg;
+        if (alg->cra_ablkcipher.ivsize != CTR_RFC3686_BLOCK_SIZE)
+                goto err_drop_spawn;
 
         /* Not a stream cipher? */
         if (alg->cra_blocksize != 1)
-                goto out_put_alg;
+                goto err_drop_spawn;
 
-        inst = crypto_alloc_instance("rfc3686", alg);
-        if (IS_ERR(inst))
-                goto out;
+        err = -ENAMETOOLONG;
+        if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME, "rfc3686(%s)",
+                     alg->cra_name) >= CRYPTO_MAX_ALG_NAME)
+                goto err_drop_spawn;
+        if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
+                     "rfc3686(%s)", alg->cra_driver_name) >=
+                        CRYPTO_MAX_ALG_NAME)
+                goto err_drop_spawn;
 
-        inst->alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER;
         inst->alg.cra_priority = alg->cra_priority;
         inst->alg.cra_blocksize = 1;
         inst->alg.cra_alignmask = alg->cra_alignmask;
-        inst->alg.cra_type = &crypto_blkcipher_type;
 
-        inst->alg.cra_blkcipher.ivsize = CTR_RFC3686_IV_SIZE;
-        inst->alg.cra_blkcipher.min_keysize = alg->cra_blkcipher.min_keysize
-                                              + CTR_RFC3686_NONCE_SIZE;
-        inst->alg.cra_blkcipher.max_keysize = alg->cra_blkcipher.max_keysize
-                                              + CTR_RFC3686_NONCE_SIZE;
+        inst->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                              (alg->cra_flags & CRYPTO_ALG_ASYNC);
+        inst->alg.cra_type = &crypto_ablkcipher_type;
+
+        inst->alg.cra_ablkcipher.ivsize = CTR_RFC3686_IV_SIZE;
+        inst->alg.cra_ablkcipher.min_keysize =
+                alg->cra_ablkcipher.min_keysize + CTR_RFC3686_NONCE_SIZE;
+        inst->alg.cra_ablkcipher.max_keysize =
+                alg->cra_ablkcipher.max_keysize + CTR_RFC3686_NONCE_SIZE;
 
-        inst->alg.cra_blkcipher.geniv = "seqiv";
+        inst->alg.cra_ablkcipher.geniv = "seqiv";
+
+        inst->alg.cra_ablkcipher.setkey = crypto_rfc3686_setkey;
+        inst->alg.cra_ablkcipher.encrypt = crypto_rfc3686_crypt;
+        inst->alg.cra_ablkcipher.decrypt = crypto_rfc3686_crypt;
 
         inst->alg.cra_ctxsize = sizeof(struct crypto_rfc3686_ctx);
 
         inst->alg.cra_init = crypto_rfc3686_init_tfm;
         inst->alg.cra_exit = crypto_rfc3686_exit_tfm;
 
-        inst->alg.cra_blkcipher.setkey = crypto_rfc3686_setkey;
-        inst->alg.cra_blkcipher.encrypt = crypto_rfc3686_crypt;
-        inst->alg.cra_blkcipher.decrypt = crypto_rfc3686_crypt;
-
-out:
-        crypto_mod_put(alg);
         return inst;
 
-out_put_alg:
-        inst = ERR_PTR(err);
-        goto out;
+err_drop_spawn:
+        crypto_drop_skcipher(spawn);
+err_free_inst:
+        kfree(inst);
+        return ERR_PTR(err);
+}
+
+static void crypto_rfc3686_free(struct crypto_instance *inst)
+{
+        struct crypto_skcipher_spawn *spawn = crypto_instance_ctx(inst);
+
+        crypto_drop_skcipher(spawn);
+        kfree(inst);
 }
 
 static struct crypto_template crypto_rfc3686_tmpl = {
         .name = "rfc3686",
         .alloc = crypto_rfc3686_alloc,
-        .free = crypto_ctr_free,
+        .free = crypto_rfc3686_free,
         .module = THIS_MODULE,
 };
 
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/pcompress.c b/crypto/pcompress.c
index 04e083ff5373..7140fe70c7af 100644
--- a/crypto/pcompress.c
+++ b/crypto/pcompress.c
@@ -53,8 +53,7 @@ static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_comp rpcomp;
 
-        snprintf(rpcomp.type, CRYPTO_MAX_ALG_NAME, "%s", "pcomp");
-
+        strncpy(rpcomp.type, "pcomp", sizeof(rpcomp.type));
         if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,
                     sizeof(struct crypto_report_comp), &rpcomp))
                 goto nla_put_failure;
diff --git a/crypto/rng.c b/crypto/rng.c
index f3b7894dec00..e0a25c2456de 100644
--- a/crypto/rng.c
+++ b/crypto/rng.c
@@ -65,7 +65,7 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_rng rrng;
 
-        snprintf(rrng.type, CRYPTO_MAX_ALG_NAME, "%s", "rng");
+        strncpy(rrng.type, "rng", sizeof(rrng.type));
 
         rrng.seedsize = alg->cra_rng.seedsize;
 
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)
diff --git a/crypto/shash.c b/crypto/shash.c
index f426330f1017..929058a68561 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -530,7 +530,8 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
         struct crypto_report_hash rhash;
         struct shash_alg *salg = __crypto_shash_alg(alg);
 
-        snprintf(rhash.type, CRYPTO_MAX_ALG_NAME, "%s", "shash");
+        strncpy(rhash.type, "shash", sizeof(rhash.type));
+
         rhash.blocksize = alg->cra_blocksize;
         rhash.digestsize = salg->digestsize;
 
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 7ae2130e1b00..87ef7d66bc20 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1591,6 +1591,10 @@ static int do_test(int m)
                                    speed_template_16_24_32);
                 test_acipher_speed("ofb(aes)", DECRYPT, sec, NULL, 0,
                                    speed_template_16_24_32);
+                test_acipher_speed("rfc3686(ctr(aes))", ENCRYPT, sec, NULL, 0,
+                                   speed_template_20_28_36);
+                test_acipher_speed("rfc3686(ctr(aes))", DECRYPT, sec, NULL, 0,
+                                   speed_template_20_28_36);
                 break;
 
         case 501:
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index cd2068524f3f..ecdeeb1a7b05 100644
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -51,6 +51,7 @@ static u8 speed_template_8_16[] = {8, 16, 0};
 static u8 speed_template_8_32[] = {8, 32, 0};
 static u8 speed_template_16_32[] = {16, 32, 0};
 static u8 speed_template_16_24_32[] = {16, 24, 32, 0};
+static u8 speed_template_20_28_36[] = {20, 28, 36, 0};
 static u8 speed_template_32_40_48[] = {32, 40, 48, 0};
 static u8 speed_template_32_48[] = {32, 48, 0};
 static u8 speed_template_32_48_64[] = {32, 48, 64, 0};
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index edf4a0818773..efd8b20e13dc 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2269,6 +2269,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "ecb(fcrypt)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = fcrypt_pcbc_enc_tv_template,
+                                        .count = 1
+                                },
+                                .dec = {
+                                        .vecs = fcrypt_pcbc_dec_tv_template,
+                                        .count = 1
+                                }
+                        }
+                }
+        }, {
                 .alg = "ecb(khazad)",
                 .test = alg_test_skcipher,
                 .suite = {
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index b5721e0b979c..3db1b7591559 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -25084,38 +25084,40 @@ static struct pcomp_testvec zlib_decomp_tv_template[] = {
 static struct comp_testvec lzo_comp_tv_template[] = {
         {
                 .inlen  = 70,
-                .outlen = 46,
+                .outlen = 57,
                 .input  = "Join us now and share the software "
                         "Join us now and share the software ",
                 .output = "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"
-                        "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                        "\x64\x20\x73\x68\x61\x72\x65\x20"
-                        "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                        "\x77\x70\x01\x01\x4a\x6f\x69\x6e"
-                        "\x3d\x88\x00\x11\x00\x00",
+                          "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
+                          "\x64\x20\x73\x68\x61\x72\x65\x20"
+                          "\x74\x68\x65\x20\x73\x6f\x66\x74"
+                          "\x77\x70\x01\x32\x88\x00\x0c\x65"
+                          "\x20\x74\x68\x65\x20\x73\x6f\x66"
+                          "\x74\x77\x61\x72\x65\x20\x11\x00"
+                          "\x00",
         }, {
                 .inlen  = 159,
-                .outlen = 133,
+                .outlen = 131,
                 .input  = "This document describes a compression method based on the LZO "
                         "compression algorithm.  This document defines the application of "
                         "the LZO algorithm used in UBIFS.",
-                .output = "\x00\x2b\x54\x68\x69\x73\x20\x64"
+                .output = "\x00\x2c\x54\x68\x69\x73\x20\x64"
                           "\x6f\x63\x75\x6d\x65\x6e\x74\x20"
                           "\x64\x65\x73\x63\x72\x69\x62\x65"
                           "\x73\x20\x61\x20\x63\x6f\x6d\x70"
                           "\x72\x65\x73\x73\x69\x6f\x6e\x20"
                           "\x6d\x65\x74\x68\x6f\x64\x20\x62"
                           "\x61\x73\x65\x64\x20\x6f\x6e\x20"
-                          "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"
-                          "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"
-                          "\x69\x74\x68\x6d\x2e\x20\x20\x54"
-                          "\x68\x69\x73\x2a\x54\x01\x02\x66"
-                          "\x69\x6e\x65\x73\x94\x06\x05\x61"
-                          "\x70\x70\x6c\x69\x63\x61\x74\x76"
-                          "\x0a\x6f\x66\x88\x02\x60\x09\x27"
-                          "\xf0\x00\x0c\x20\x75\x73\x65\x64"
-                          "\x20\x69\x6e\x20\x55\x42\x49\x46"
-                          "\x53\x2e\x11\x00\x00",
+                          "\x74\x68\x65\x20\x4c\x5a\x4f\x20"
+                          "\x2a\x8c\x00\x09\x61\x6c\x67\x6f"
+                          "\x72\x69\x74\x68\x6d\x2e\x20\x20"
+                          "\x2e\x54\x01\x03\x66\x69\x6e\x65"
+                          "\x73\x20\x74\x06\x05\x61\x70\x70"
+                          "\x6c\x69\x63\x61\x74\x76\x0a\x6f"
+                          "\x66\x88\x02\x60\x09\x27\xf0\x00"
+                          "\x0c\x20\x75\x73\x65\x64\x20\x69"
+                          "\x6e\x20\x55\x42\x49\x46\x53\x2e"
+                          "\x11\x00\x00",
         },
 };