3 files changed, 33 insertions, 11 deletions

diff --git a/crypto/crypto_user_base.c b/crypto/crypto_user_base.c
index e41f6cc33fff..784748dbb19f 100644
--- a/crypto/crypto_user_base.c
+++ b/crypto/crypto_user_base.c
@@ -84,7 +84,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_cipher rcipher;
 
-        strlcpy(rcipher.type, "cipher", sizeof(rcipher.type));
+        strncpy(rcipher.type, "cipher", sizeof(rcipher.type));
 
         rcipher.blocksize = alg->cra_blocksize;
         rcipher.min_keysize = alg->cra_cipher.cia_min_keysize;
@@ -103,7 +103,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_comp rcomp;
 
-        strlcpy(rcomp.type, "compression", sizeof(rcomp.type));
+        strncpy(rcomp.type, "compression", sizeof(rcomp.type));
         if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,
                     sizeof(struct crypto_report_comp), &rcomp))
                 goto nla_put_failure;
@@ -117,7 +117,7 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_acomp racomp;
 
-        strlcpy(racomp.type, "acomp", sizeof(racomp.type));
+        strncpy(racomp.type, "acomp", sizeof(racomp.type));
 
         if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,
                     sizeof(struct crypto_report_acomp), &racomp))
@@ -132,7 +132,7 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_akcipher rakcipher;
 
-        strlcpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
+        strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
 
         if (nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,
                     sizeof(struct crypto_report_akcipher), &rakcipher))
@@ -147,7 +147,7 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
 {
         struct crypto_report_kpp rkpp;
 
-        strlcpy(rkpp.type, "kpp", sizeof(rkpp.type));
+        strncpy(rkpp.type, "kpp", sizeof(rkpp.type));
 
         if (nla_put(skb, CRYPTOCFGA_REPORT_KPP,
                     sizeof(struct crypto_report_kpp), &rkpp))
@@ -161,10 +161,10 @@ nla_put_failure:
 static int crypto_report_one(struct crypto_alg *alg,
                              struct crypto_user_alg *ualg, struct sk_buff *skb)
 {
-        strlcpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
-        strlcpy(ualg->cru_driver_name, alg->cra_driver_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));
-        strlcpy(ualg->cru_module_name, module_name(alg->cra_module),
+        strncpy(ualg->cru_module_name, module_name(alg->cra_module),
                 sizeof(ualg->cru_module_name));
 
         ualg->cru_type = 0;
@@ -177,7 +177,7 @@ static int crypto_report_one(struct crypto_alg *alg,
         if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
                 struct crypto_report_larval rl;
 
-                strlcpy(rl.type, "larval", sizeof(rl.type));
+                strncpy(rl.type, "larval", sizeof(rl.type));
                 if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL,
                             sizeof(struct crypto_report_larval), &rl))
                         goto nla_put_failure;
diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
index 021ad06bbb62..1dfaa0ccd555 100644
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
@@ -37,6 +37,8 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&raead, 0, sizeof(raead));
+
         strncpy(raead.type, "aead", sizeof(raead.type));
 
         v32 = atomic_read(&alg->encrypt_cnt);
@@ -65,6 +67,8 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rcipher, 0, sizeof(rcipher));
+
         strlcpy(rcipher.type, "cipher", sizeof(rcipher.type));
 
         v32 = atomic_read(&alg->encrypt_cnt);
@@ -93,6 +97,8 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rcomp, 0, sizeof(rcomp));
+
         strlcpy(rcomp.type, "compression", sizeof(rcomp.type));
         v32 = atomic_read(&alg->compress_cnt);
         rcomp.stat_compress_cnt = v32;
@@ -120,6 +126,8 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&racomp, 0, sizeof(racomp));
+
         strlcpy(racomp.type, "acomp", sizeof(racomp.type));
         v32 = atomic_read(&alg->compress_cnt);
         racomp.stat_compress_cnt = v32;
@@ -147,6 +155,8 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rakcipher, 0, sizeof(rakcipher));
+
         strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
         v32 = atomic_read(&alg->encrypt_cnt);
         rakcipher.stat_encrypt_cnt = v32;
@@ -177,6 +187,8 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
         struct crypto_stat rkpp;
         u32 v;
 
+        memset(&rkpp, 0, sizeof(rkpp));
+
         strlcpy(rkpp.type, "kpp", sizeof(rkpp.type));
 
         v = atomic_read(&alg->setsecret_cnt);
@@ -203,6 +215,8 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rhash, 0, sizeof(rhash));
+
         strncpy(rhash.type, "ahash", sizeof(rhash.type));
 
         v32 = atomic_read(&alg->hash_cnt);
@@ -227,6 +241,8 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rhash, 0, sizeof(rhash));
+
         strncpy(rhash.type, "shash", sizeof(rhash.type));
 
         v32 = atomic_read(&alg->hash_cnt);
@@ -251,6 +267,8 @@ static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
         u64 v64;
         u32 v32;
 
+        memset(&rrng, 0, sizeof(rrng));
+
         strncpy(rrng.type, "rng", sizeof(rrng.type));
 
         v32 = atomic_read(&alg->generate_cnt);
@@ -275,6 +293,8 @@ static int crypto_reportstat_one(struct crypto_alg *alg,
                                  struct crypto_user_alg *ualg,
                                  struct sk_buff *skb)
 {
+        memset(ualg, 0, sizeof(*ualg));
+
         strlcpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
         strlcpy(ualg->cru_driver_name, alg->cra_driver_name,
                 sizeof(ualg->cru_driver_name));
@@ -291,6 +311,7 @@ static int crypto_reportstat_one(struct crypto_alg *alg,
         if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
                 struct crypto_stat rl;
 
+                memset(&rl, 0, sizeof(rl));
                 strlcpy(rl.type, "larval", sizeof(rl.type));
                 if (nla_put(skb, CRYPTOCFGA_STAT_LARVAL,
                             sizeof(struct crypto_stat), &rl))
diff --git a/crypto/simd.c b/crypto/simd.c
index ea7240be3001..78e8d037ae2b 100644
--- a/crypto/simd.c
+++ b/crypto/simd.c
@@ -124,8 +124,9 @@ static int simd_skcipher_init(struct crypto_skcipher *tfm)
 
         ctx->cryptd_tfm = cryptd_tfm;
 
-        reqsize = sizeof(struct skcipher_request);
-        reqsize += crypto_skcipher_reqsize(&cryptd_tfm->base);
+        reqsize = crypto_skcipher_reqsize(cryptd_skcipher_child(cryptd_tfm));
+        reqsize = max(reqsize, crypto_skcipher_reqsize(&cryptd_tfm->base));
+        reqsize += sizeof(struct skcipher_request);
 
         crypto_skcipher_set_reqsize(tfm, reqsize);