x86/platform/uv: use strscpy to instead of strncpy()
Subsystems (3)
PATCH v2 1/1 x86/platform/uv: 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.
---
change for v2
- fix the mistake and make the code better and simpler,
thanks to Andy Shevchenko.
---
--- arch/x86/platform/uv/uv_nmi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/x86/platform/uv/uv_nmi.c +1 -5
@@ -205,11 +205,7 @@ static int param_set_action(const char *val, const struct kernel_param *kp)char arg[ACTION_LEN ], *p;/* (remove possible '\n') */ -strncpy (arg, val,ACTION_LEN -1 ); - arg[ACTION_LEN -1 ] ='\0' ; - p =strchr (arg,'\n' ); -if (p) - *p ='\0' ; +strscpy (arg, val,strnchrnul (val,ACTION_LEN ,'\n' ) - val);for (i =0 ; i < n; i++)if (!strcmp (arg, valid_acts[i].action))
Signature · 1 line
2.15.2
Quoted 2 lines · On Mon, Dec 5, 2022 at 1:42 PM <[email protected]> wrote:
From: Xu Panda <[email protected]>
Thank you for an update, my comments below.
Quoted 7 lines
The implementation of
strscpy()is more robust and safer. That's now the recommended way to copy NUL terminated strings.
---
change for v2
- fix the mistake and make the code better and simpler,
thanks to Andy Shevchenko.
---
This is (the changelog) in the wrong place.
Quoted 4 lines
Signed-off-by Xu Panda <[email protected]>Signed-off-by Yang Yang <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
No, I haven't given you this tag, sorry. The changelog is enough to give credit.
...
arch/x86/platform/uv/uv_nmi.c static int param_set_action(const char *val, const struct kernel_param *kp) · line 208
Quoted 9 lines
char arg[ACTION_LEN], *p; /* (remove possible '\n') */arch/x86/platform/uv/uv_nmi.c +1
-5-strncpy (arg, val,ACTION_LEN -1 ); - arg[ACTION_LEN -1 ] ='\0' ; - p =strchr (arg,'\n' ); -if (p) - *p ='\0' ; +strscpy (arg, val,strnchrnul (val,ACTION_LEN ,'\n' ) - val);
And even better is to replace ACTION_LEN by sizeof(arg).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 1 line · Andy Shevchenko
On Mon, Dec 5, 2022 at 1:42 PM <[email protected]> wrote:
...
Quoted 11 lines
arch/x86/platform/uv/uv_nmi.c static int param_set_action(const char *val, const struct kernel_param *kp) · line 208
Quoted 9 lines
char arg[ACTION_LEN], *p; /* (remove possible '\n') */arch/x86/platform/uv/uv_nmi.c +1
-5-strncpy (arg, val,ACTION_LEN -1 ); - arg[ACTION_LEN -1 ] ='\0' ; - p =strchr (arg,'\n' ); -if (p) - *p ='\0' ; +strscpy (arg, val,strnchrnul (val,ACTION_LEN ,'\n' ) - val);And even better is to replace
ACTION_LENby sizeof(arg).
Btw, have you compiled this with make W=1 ...? I believe you will get a new warning after your change.
Signature · 2 lines
With Best Regards, Andy Shevchenko