2023-01-05 13:13:32

by Yang Yang

Subject: [PATCH linux-next v3] s390/zcrypt: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL-terminated strings.

Signed-off-by: Xu Panda <[email protected]>
Signed-off-by: Yang Yang <[email protected]>
---
chang for v3
- fix the sign-off Email address
chang for v2
- match the FROM with the Email
---
drivers/s390/crypto/zcrypt_api.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 4bf36e53fe3e..6fe05bb82c77 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -347,8 +347,7 @@ static ssize_t zcdn_create_store(struct class *class,
int rc;
char name[ZCDN_MAX_NAME];

- strncpy(name, skip_spaces(buf), sizeof(name));
- name[sizeof(name) - 1] = '\0';
+ strscpy(name, skip_spaces(buf), sizeof(name));

rc = zcdn_create(strim(name));

@@ -365,8 +364,7 @@ static ssize_t zcdn_destroy_store(struct class *class,
int rc;
char name[ZCDN_MAX_NAME];

- strncpy(name, skip_spaces(buf), sizeof(name));
- name[sizeof(name) - 1] = '\0';
+ strscpy(name, skip_spaces(buf), sizeof(name));

rc = zcdn_destroy(strim(name));

--
2.15.2

2023-01-05 16:36:51

by Heiko Carstens

Subject: Re: [PATCH linux-next v3] s390/zcrypt: use strscpy() to instead of strncpy()

On Thu, Jan 05, 2023 at 08:24:34PM +0800, [email protected] wrote:
> From: Xu Panda <[email protected]>
>
> The implementation of strscpy() is more robust and safer.
> That's now the recommended way to copy NUL-terminated strings.
>
> Signed-off-by: Xu Panda <[email protected]>
> Signed-off-by: Yang Yang <[email protected]>
> ---
> chang for v3
> - fix the sign-off Email address
> chang for v2
> - match the FROM with the Email
> ---
> drivers/s390/crypto/zcrypt_api.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)

Applied, thanks.