crypto: ccp - Replace snprintf("%s") with strscpy

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

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

diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
index 6c8d1b87d60d0b8417f9e55d0b0346aaa1d8da43..fc14c2e73ccd6d8a9e211796d8626b8a66893f82 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-aes-galois.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/scatterlist.h>
+#include <linux/string.h>
 #include <linux/crypto.h>
 #include <crypto/internal/aead.h>
 #include <crypto/algapi.h>
@@ -223,9 +224,8 @@ static int ccp_register_aes_aead(struct list_head *head,
        /* Copy the defaults and override as necessary */
        alg = &ccp_aead->alg;
        *alg = *def->alg_defaults;
-       snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                def->driver_name);
+       strscpy(alg->base.cra_name, def->name);
+       strscpy(alg->base.cra_driver_name, def->driver_name);
        alg->base.cra_blocksize = def->blocksize;
 
        ret = crypto_register_aead(alg);

diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
index c7e26ce7115663ce0136d9715d747135e7139760..8e59137284b7570412b261b57fb7ecb0af414065 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/scatterlist.h>
+#include <linux/string.h>
 #include <crypto/aes.h>
 #include <crypto/xts.h>
 #include <crypto/internal/skcipher.h>
@@ -239,9 +240,8 @@ static int ccp_register_aes_xts_alg(struct list_head *head,
 
        alg = &ccp_alg->alg;
 
-       snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                def->drv_name);
+       strscpy(alg->base.cra_name, def->name);
+       strscpy(alg->base.cra_driver_name, def->drv_name);
        alg->base.cra_flags     = CRYPTO_ALG_ASYNC |
                                  CRYPTO_ALG_ALLOCATES_MEMORY |
                                  CRYPTO_ALG_KERN_DRIVER_ONLY |

diff --git a/drivers/crypto/ccp/ccp-crypto-aes.c b/drivers/crypto/ccp/ccp-crypto-aes.c
index 01d298350b92536833068fce9d7a9c4b537dc11f..94bccc5d6c789a08222867ee1a97a61797c3c168 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-aes.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes.c
@@ -305,9 +305,8 @@ static int ccp_register_aes_alg(struct list_head *head,
        /* Copy the defaults and override as necessary */
        alg = &ccp_alg->alg;
        *alg = *def->alg_defaults;
-       snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                def->driver_name);
+       strscpy(alg->base.cra_name, def->name);
+       strscpy(alg->base.cra_driver_name, def->driver_name);
        alg->base.cra_blocksize = def->blocksize;
        alg->ivsize = def->ivsize;
 

diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c
index c20b5a6a340af8c599bbe5482ddf8891960b0cde..e26b431a5993db3e2c9beb2d4f90fc9aad7ba01d 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-des3.c
+++ b/drivers/crypto/ccp/ccp-crypto-des3.c
@@ -193,9 +193,8 @@ static int ccp_register_des3_alg(struct list_head *head,
        /* Copy the defaults and override as necessary */
        alg = &ccp_alg->alg;
        *alg = *def->alg_defaults;
-       snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                       def->driver_name);
+       strscpy(alg->base.cra_name, def->name);
+       strscpy(alg->base.cra_driver_name, def->driver_name);
        alg->base.cra_blocksize = def->blocksize;
        alg->ivsize = def->ivsize;
 

diff --git a/drivers/crypto/ccp/ccp-crypto-rsa.c b/drivers/crypto/ccp/ccp-crypto-rsa.c
index 090adacaaf93eaa28e7f5873a7a8c91c11d1e29f..287d7f62026d2c92efa0b9b0106ed64c73d991b5 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-rsa.c
+++ b/drivers/crypto/ccp/ccp-crypto-rsa.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/scatterlist.h>
+#include <linux/string.h>
 #include <linux/crypto.h>
 #include <crypto/algapi.h>
 #include <crypto/internal/rsa.h>
@@ -257,9 +258,8 @@ static int ccp_register_rsa_alg(struct list_head *head,
 
        alg = &ccp_alg->alg;
        *alg = *def->alg_defaults;
-       snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                def->driver_name);
+       strscpy(alg->base.cra_name, def->name);
+       strscpy(alg->base.cra_driver_name, def->driver_name);
        ret = crypto_register_akcipher(alg);
        if (ret) {
                pr_err("%s akcipher algorithm registration error (%d)\n",

diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 286b2d716236c113a2e7863a932966d28161d6eb..85058a89f35b299ee0f85fb38ff26590a3bac2a4 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -484,9 +484,8 @@ static int ccp_register_sha_alg(struct list_head *head,
        halg->statesize = sizeof(struct ccp_sha_exp_ctx);
 
        base = &halg->base;
-       snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
-       snprintf(base->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
-                def->drv_name);
+       strscpy(base->cra_name, def->name);
+       strscpy(base->cra_driver_name, def->drv_name);
        base->cra_flags = CRYPTO_ALG_ASYNC |
                          CRYPTO_ALG_ALLOCATES_MEMORY |
                          CRYPTO_ALG_KERN_DRIVER_ONLY |