crypto: ccree - replace snprintf("%s") with strscpy

Replace snprintf("%s") with the faster and more direct strscpy().

In cc_aead.c, group the includes while at it.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c
index 81533681f7fb59abf1123d2d045f3d74eda17348..088c4603047f048cdaf8287c3c92aa01e9f5919c 100644 (file)
--- a/drivers/crypto/ccree/cc_aead.c
+++ b/drivers/crypto/ccree/cc_aead.c
@@ -3,11 +3,12 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/rtnetlink.h>
+#include <linux/string.h>
 #include <crypto/algapi.h>
 #include <crypto/internal/aead.h>
 #include <crypto/authenc.h>
 #include <crypto/gcm.h>
-#include <linux/rtnetlink.h>
 #include <crypto/internal/des.h>
 #include "cc_driver.h"
 #include "cc_buffer_mgr.h"
@@ -2569,11 +2570,9 @@ static struct cc_crypto_alg *cc_create_aead_alg(struct cc_alg_template *tmpl,
 
        alg = &tmpl->template_aead;
 
-       if (snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s",
-                    tmpl->name) >= CRYPTO_MAX_ALG_NAME)
+       if (strscpy(alg->base.cra_name, tmpl->name) < 0)
                return ERR_PTR(-EINVAL);
-       if (snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                    tmpl->driver_name) >= CRYPTO_MAX_ALG_NAME)
+       if (strscpy(alg->base.cra_driver_name, tmpl->driver_name) < 0)
                return ERR_PTR(-EINVAL);
 
        alg->base.cra_module = THIS_MODULE;

diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c
index e2cbfdf7a0e46ee0fb261f890b5780f3dbeddee2..5339b3796c80e312a8e2418f097dd9a90b6fa997 100644 (file)
--- a/drivers/crypto/ccree/cc_cipher.c
+++ b/drivers/crypto/ccree/cc_cipher.c
@@ -3,6 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/string.h>
 #include <crypto/algapi.h>
 #include <crypto/internal/skcipher.h>
 #include <crypto/internal/des.h>
@@ -1386,11 +1387,9 @@ static struct cc_crypto_alg *cc_create_alg(const struct cc_alg_template *tmpl,
 
        memcpy(alg, &tmpl->template_skcipher, sizeof(*alg));
 
-       if (snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s",
-                    tmpl->name) >= CRYPTO_MAX_ALG_NAME)
+       if (strscpy(alg->base.cra_name, tmpl->name) < 0)
                return ERR_PTR(-EINVAL);
-       if (snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                    tmpl->driver_name) >= CRYPTO_MAX_ALG_NAME)
+       if (strscpy(alg->base.cra_driver_name, tmpl->driver_name) < 0)
                return ERR_PTR(-EINVAL);
 
        alg->base.cra_module = THIS_MODULE;

diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c
index 73179bf725a712dde2d95482d3413d10413e336f..5de721a2ca30aea33f3146b845be4820dde54baf 100644 (file)
--- a/drivers/crypto/ccree/cc_hash.c
+++ b/drivers/crypto/ccree/cc_hash.c
@@ -3,6 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/string.h>
 #include <crypto/algapi.h>
 #include <crypto/hash.h>
 #include <crypto/md5.h>
@@ -1835,16 +1836,12 @@ static struct cc_hash_alg *cc_alloc_hash_alg(struct cc_hash_template *template,
        alg = &halg->halg.base;
 
        if (keyed) {
-               snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
-                        template->mac_name);
-               snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                        template->mac_driver_name);
+               strscpy(alg->cra_name, template->mac_name);
+               strscpy(alg->cra_driver_name, template->mac_driver_name);
        } else {
                halg->setkey = NULL;
-               snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
-                        template->name);
-               snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                        template->driver_name);
+               strscpy(alg->cra_name, template->name);
+               strscpy(alg->cra_driver_name, template->driver_name);
        }
        alg->cra_module = THIS_MODULE;
        alg->cra_ctxsize = sizeof(struct cc_hash_ctx) + crypto_dma_padding();