[PATCH] crypto: octeontx - use strscpy_pad in ucode_load_store

[PATCH] crypto: octeontx - use strscpy_pad in ucode_load_store

[Thorsten Blum]

Instead of zero-initializing the temporary buffer and then copying into
it with strscpy(), use strscpy_pad() to copy the string and zero-pad any
trailing bytes. Drop the explicit size argument to further simplify the
code since strscpy_pad() can determine it automatically when the
destination buffer has a fixed length.

Also use strscpy_pad() to check for string truncation instead of the
hard-coded OTX_CPT_UCODE_NAME_LENGTH.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
index e0f38d32bc93..205579a6ba2b 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
@@ -1318,7 +1318,7 @@ static ssize_t ucode_load_store(struct device *dev,
 {
 	struct otx_cpt_engines engs[OTX_CPT_MAX_ETYPES_PER_GRP] = { {0} };
 	char *ucode_filename[OTX_CPT_MAX_ETYPES_PER_GRP];
-	char tmp_buf[OTX_CPT_UCODE_NAME_LENGTH] = { 0 };
+	char tmp_buf[OTX_CPT_UCODE_NAME_LENGTH];
 	char *start, *val, *err_msg, *tmp;
 	struct otx_cpt_eng_grps *eng_grps;
 	int grp_idx = 0, ret = -EINVAL;
@@ -1326,12 +1326,11 @@ static ssize_t ucode_load_store(struct device *dev,
 	int del_grp_idx = -1;
 	int ucode_idx = 0;
 
-	if (count >= OTX_CPT_UCODE_NAME_LENGTH)
+	if (strscpy_pad(tmp_buf, buf) < 0)
 		return -EINVAL;
 
 	eng_grps = container_of(attr, struct otx_cpt_eng_grps, ucode_load_attr);
 	err_msg = "Invalid engine group format";
-	strscpy(tmp_buf, buf, OTX_CPT_UCODE_NAME_LENGTH);
 	start = tmp_buf;
 
 	has_se = has_ie = has_ae = false;

Re: [PATCH] crypto: octeontx - use strscpy_pad in ucode_load_store

[David Laight]

On Wed, 20 May 2026 12:00:30 +0200
Thorsten Blum <thorsten.blum@linux.dev> wrote:

> Instead of zero-initializing the temporary buffer and then copying into
> it with strscpy(), use strscpy_pad() to copy the string and zero-pad any
> trailing bytes. Drop the explicit size argument to further simplify the
> code since strscpy_pad() can determine it automatically when the
> destination buffer has a fixed length.
> 
> Also use strscpy_pad() to check for string truncation instead of the
> hard-coded OTX_CPT_UCODE_NAME_LENGTH.

This code is horrid :-)
It really ought to be possible to parse the string without taking a writeable
copy.
There is also the 'fun' that it is passed the length of the string - hopefully
it is '\0' terminated at the same length.

Then there is this beauty:
	if (strnstr(val, " ", strlen(val)))

-- David

> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
> index e0f38d32bc93..205579a6ba2b 100644
> --- a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
> +++ b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
> @@ -1318,7 +1318,7 @@ static ssize_t ucode_load_store(struct device *dev,
>  {
>  	struct otx_cpt_engines engs[OTX_CPT_MAX_ETYPES_PER_GRP] = { {0} };
>  	char *ucode_filename[OTX_CPT_MAX_ETYPES_PER_GRP];
> -	char tmp_buf[OTX_CPT_UCODE_NAME_LENGTH] = { 0 };
> +	char tmp_buf[OTX_CPT_UCODE_NAME_LENGTH];
>  	char *start, *val, *err_msg, *tmp;
>  	struct otx_cpt_eng_grps *eng_grps;
>  	int grp_idx = 0, ret = -EINVAL;
> @@ -1326,12 +1326,11 @@ static ssize_t ucode_load_store(struct device *dev,
>  	int del_grp_idx = -1;
>  	int ucode_idx = 0;
>  
> -	if (count >= OTX_CPT_UCODE_NAME_LENGTH)
> +	if (strscpy_pad(tmp_buf, buf) < 0)
>  		return -EINVAL;
>  
>  	eng_grps = container_of(attr, struct otx_cpt_eng_grps, ucode_load_attr);
>  	err_msg = "Invalid engine group format";
> -	strscpy(tmp_buf, buf, OTX_CPT_UCODE_NAME_LENGTH);
>  	start = tmp_buf;
>  
>  	has_se = has_ie = has_ae = false;
>