|
Torsten Duwe |
b6f1e1 |
From 28855860057ac0d51607a0b1386cb6c2cd1ad0d4 Mon Sep 17 00:00:00 2001
|
|
Torsten Duwe |
b6f1e1 |
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
|
|
Torsten Duwe |
b6f1e1 |
Date: Thu, 18 Aug 2022 23:00:03 +0200
|
|
Torsten Duwe |
b6f1e1 |
Subject: [PATCH] crypto: drivers - move from strlcpy with unused retval to
|
|
Torsten Duwe |
b6f1e1 |
strscpy
|
|
Torsten Duwe |
b6f1e1 |
Git-commit: 28855860057ac0d51607a0b1386cb6c2cd1ad0d4
|
|
Torsten Duwe |
b6f1e1 |
Patch-mainline: v6.1-rc1
|
|
Torsten Duwe |
b6f1e1 |
References: jsc#PED-1073
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
Follow the advice of the below link and prefer 'strscpy' in this
|
|
Torsten Duwe |
b6f1e1 |
subsystem. Conversion is 1:1 because the return value is not used.
|
|
Torsten Duwe |
b6f1e1 |
Generated by a coccinelle script.
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
|
|
Torsten Duwe |
b6f1e1 |
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
|
|
Torsten Duwe |
b6f1e1 |
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
|
|
Torsten Duwe |
b6f1e1 |
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Torsten Duwe |
b6f1e1 |
Signed-off-by: Torsten Duwe <duwe@suse.de>
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
---
|
|
Torsten Duwe |
b6f1e1 |
drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 +++---
|
|
Torsten Duwe |
b6f1e1 |
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 ++--
|
|
Torsten Duwe |
b6f1e1 |
drivers/crypto/qat/qat_common/adf_cfg.c | 6 +++---
|
|
Torsten Duwe |
b6f1e1 |
drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +-
|
|
Torsten Duwe |
b6f1e1 |
drivers/crypto/qat/qat_common/adf_transport_debug.c | 2 +-
|
|
Torsten Duwe |
b6f1e1 |
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
index 40b482198ebc5..23c6edc70914e 100644
|
|
Torsten Duwe |
b6f1e1 |
--- a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
+++ b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
@@ -97,7 +97,7 @@ static int dev_supports_eng_type(struct otx_cpt_eng_grps *eng_grps,
|
|
Torsten Duwe |
b6f1e1 |
static void set_ucode_filename(struct otx_cpt_ucode *ucode,
|
|
Torsten Duwe |
b6f1e1 |
const char *filename)
|
|
Torsten Duwe |
b6f1e1 |
{
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(ucode->filename, filename, OTX_CPT_UCODE_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(ucode->filename, filename, OTX_CPT_UCODE_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
}
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
static char *get_eng_type_str(int eng_type)
|
|
Torsten Duwe |
b6f1e1 |
@@ -138,7 +138,7 @@ static int get_ucode_type(struct otx_cpt_ucode_hdr *ucode_hdr, int *ucode_type)
|
|
Torsten Duwe |
b6f1e1 |
u32 i, val = 0;
|
|
Torsten Duwe |
b6f1e1 |
u8 nn;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(tmp_ver_str, ucode_hdr->ver_str, OTX_CPT_UCODE_VER_STR_SZ);
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(tmp_ver_str, ucode_hdr->ver_str, OTX_CPT_UCODE_VER_STR_SZ);
|
|
Torsten Duwe |
b6f1e1 |
for (i = 0; i < strlen(tmp_ver_str); i++)
|
|
Torsten Duwe |
b6f1e1 |
tmp_ver_str[i] = tolower(tmp_ver_str[i]);
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
@@ -1328,7 +1328,7 @@ static ssize_t ucode_load_store(struct device *dev,
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
eng_grps = container_of(attr, struct otx_cpt_eng_grps, ucode_load_attr);
|
|
Torsten Duwe |
b6f1e1 |
err_msg = "Invalid engine group format";
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(tmp_buf, buf, OTX_CPT_UCODE_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(tmp_buf, buf, OTX_CPT_UCODE_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
start = tmp_buf;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
has_se = has_ie = has_ae = false;
|
|
Torsten Duwe |
b6f1e1 |
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
index f10050fead164..1577986677f60 100644
|
|
Torsten Duwe |
b6f1e1 |
--- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
|
|
Torsten Duwe |
b6f1e1 |
@@ -68,7 +68,7 @@ static int is_2nd_ucode_used(struct otx2_cpt_eng_grp_info *eng_grp)
|
|
Torsten Duwe |
b6f1e1 |
static void set_ucode_filename(struct otx2_cpt_ucode *ucode,
|
|
Torsten Duwe |
b6f1e1 |
const char *filename)
|
|
Torsten Duwe |
b6f1e1 |
{
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(ucode->filename, filename, OTX2_CPT_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(ucode->filename, filename, OTX2_CPT_NAME_LENGTH);
|
|
Torsten Duwe |
b6f1e1 |
}
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
static char *get_eng_type_str(int eng_type)
|
|
Torsten Duwe |
b6f1e1 |
@@ -126,7 +126,7 @@ static int get_ucode_type(struct device *dev,
|
|
Torsten Duwe |
b6f1e1 |
int i, val = 0;
|
|
Torsten Duwe |
b6f1e1 |
u8 nn;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(tmp_ver_str, ucode_hdr->ver_str, OTX2_CPT_UCODE_VER_STR_SZ);
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(tmp_ver_str, ucode_hdr->ver_str, OTX2_CPT_UCODE_VER_STR_SZ);
|
|
Torsten Duwe |
b6f1e1 |
for (i = 0; i < strlen(tmp_ver_str); i++)
|
|
Torsten Duwe |
b6f1e1 |
tmp_ver_str[i] = tolower(tmp_ver_str[i]);
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
diff --git a/drivers/crypto/qat/qat_common/adf_cfg.c b/drivers/crypto/qat/qat_common/adf_cfg.c
|
|
Torsten Duwe |
b6f1e1 |
index e61b3e13db3bd..1931e5b37f2bd 100644
|
|
Torsten Duwe |
b6f1e1 |
--- a/drivers/crypto/qat/qat_common/adf_cfg.c
|
|
Torsten Duwe |
b6f1e1 |
+++ b/drivers/crypto/qat/qat_common/adf_cfg.c
|
|
Torsten Duwe |
b6f1e1 |
@@ -251,13 +251,13 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
|
|
Torsten Duwe |
b6f1e1 |
return -ENOMEM;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
INIT_LIST_HEAD(&key_val->list);
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(key_val->key, key, sizeof(key_val->key));
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(key_val->key, key, sizeof(key_val->key));
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
if (type == ADF_DEC) {
|
|
Torsten Duwe |
b6f1e1 |
snprintf(key_val->val, ADF_CFG_MAX_VAL_LEN_IN_BYTES,
|
|
Torsten Duwe |
b6f1e1 |
"%ld", (*((long *)val)));
|
|
Torsten Duwe |
b6f1e1 |
} else if (type == ADF_STR) {
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(key_val->val, (char *)val, sizeof(key_val->val));
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(key_val->val, (char *)val, sizeof(key_val->val));
|
|
Torsten Duwe |
b6f1e1 |
} else if (type == ADF_HEX) {
|
|
Torsten Duwe |
b6f1e1 |
snprintf(key_val->val, ADF_CFG_MAX_VAL_LEN_IN_BYTES,
|
|
Torsten Duwe |
b6f1e1 |
"0x%lx", (unsigned long)val);
|
|
Torsten Duwe |
b6f1e1 |
@@ -315,7 +315,7 @@ int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name)
|
|
Torsten Duwe |
b6f1e1 |
if (!sec)
|
|
Torsten Duwe |
b6f1e1 |
return -ENOMEM;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(sec->name, name, sizeof(sec->name));
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(sec->name, name, sizeof(sec->name));
|
|
Torsten Duwe |
b6f1e1 |
INIT_LIST_HEAD(&sec->param_head);
|
|
Torsten Duwe |
b6f1e1 |
down_write(&cfg->lock);
|
|
Torsten Duwe |
b6f1e1 |
list_add_tail(&sec->list, &cfg->sec_list);
|
|
Torsten Duwe |
b6f1e1 |
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
|
|
Torsten Duwe |
b6f1e1 |
index e8ac932bbaab6..508c18edd692f 100644
|
|
Torsten Duwe |
b6f1e1 |
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
|
|
Torsten Duwe |
b6f1e1 |
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
|
|
Torsten Duwe |
b6f1e1 |
@@ -363,7 +363,7 @@ static int adf_ctl_ioctl_get_status(struct file *fp, unsigned int cmd,
|
|
Torsten Duwe |
b6f1e1 |
dev_info.num_logical_accel = hw_data->num_logical_accel;
|
|
Torsten Duwe |
b6f1e1 |
dev_info.banks_per_accel = hw_data->num_banks
|
|
Torsten Duwe |
b6f1e1 |
/ hw_data->num_logical_accel;
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(dev_info.name, hw_data->dev_class->name, sizeof(dev_info.name));
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(dev_info.name, hw_data->dev_class->name, sizeof(dev_info.name));
|
|
Torsten Duwe |
b6f1e1 |
dev_info.instance_id = hw_data->instance_id;
|
|
Torsten Duwe |
b6f1e1 |
dev_info.type = hw_data->dev_class->type;
|
|
Torsten Duwe |
b6f1e1 |
dev_info.bus = accel_to_pci_dev(accel_dev)->bus->number;
|
|
Torsten Duwe |
b6f1e1 |
diff --git a/drivers/crypto/qat/qat_common/adf_transport_debug.c b/drivers/crypto/qat/qat_common/adf_transport_debug.c
|
|
Torsten Duwe |
b6f1e1 |
index e69e5907f5950..08bca1c506c0e 100644
|
|
Torsten Duwe |
b6f1e1 |
--- a/drivers/crypto/qat/qat_common/adf_transport_debug.c
|
|
Torsten Duwe |
b6f1e1 |
+++ b/drivers/crypto/qat/qat_common/adf_transport_debug.c
|
|
Torsten Duwe |
b6f1e1 |
@@ -96,7 +96,7 @@ int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name)
|
|
Torsten Duwe |
b6f1e1 |
if (!ring_debug)
|
|
Torsten Duwe |
b6f1e1 |
return -ENOMEM;
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
- strlcpy(ring_debug->ring_name, name, sizeof(ring_debug->ring_name));
|
|
Torsten Duwe |
b6f1e1 |
+ strscpy(ring_debug->ring_name, name, sizeof(ring_debug->ring_name));
|
|
Torsten Duwe |
b6f1e1 |
snprintf(entry_name, sizeof(entry_name), "ring_%02d",
|
|
Torsten Duwe |
b6f1e1 |
ring->ring_number);
|
|
Torsten Duwe |
b6f1e1 |
|
|
Torsten Duwe |
b6f1e1 |
--
|
|
Torsten Duwe |
b6f1e1 |
2.35.3
|
|
Torsten Duwe |
b6f1e1 |
|