2022-12-05 11:51:57

by Yang Yang

Subject: [PATCH linux-next] ipmi/watchdog: use strscpy() to instead of strncpy()

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]>
---
drivers/char/ipmi/ipmi_watchdog.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 47365150e431..0d4a8dcacfd4 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp)
char valcp[16];
char *s;

- strncpy(valcp, val, 15);
- valcp[15] = '\0';
+ strscpy(valcp, val, 16);

s = strstrip(valcp);

--
2.15.2

2022-12-05 13:43:17

by Corey Minyard

Subject: Re: [PATCH linux-next] ipmi/watchdog: use strscpy() to instead of strncpy()

On Mon, Dec 05, 2022 at 07:36:40PM +0800, [email protected] wrote:
> Xu Panda <[email protected]>
>
> The implementation of strscpy() is more robust and safer.
> That's now the recommended way to copy NUL terminated strings.

This looks right. Applied, thanks.

-corey

>
> Signed-off-by: Xu Panda <[email protected]>
> Signed-off-by: Yang Yang <[email protected]>
> ---
> drivers/char/ipmi/ipmi_watchdog.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
> index 47365150e431..0d4a8dcacfd4 100644
> --- a/drivers/char/ipmi/ipmi_watchdog.c
> +++ b/drivers/char/ipmi/ipmi_watchdog.c
> @@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp)
> char valcp[16];
> char *s;
>
> - strncpy(valcp, val, 15);
> - valcp[15] = '\0';
> + strscpy(valcp, val, 16);
>
> s = strstrip(valcp);
>
> --
> 2.15.2