x86/platform/uv: use strscpy to instead of strncpy()
Subsystems (3)
PATCH 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.
--- arch/x86/platform/uv/uv_nmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/platform/uv/uv_nmi.c +2 -3
@@ -205,8 +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' ; +strscpy (arg, val,ACTION_LEN -1 ); p =strchr (arg,'\n' );if (p) *p ='\0' ;
@@ -959,7 +958,7 @@ static int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)/* Unexpected return, revert action to "dump" */ if (master) -strncpy (uv_nmi_action,"dump" ,strlen (uv_nmi_action)); +strscpy (uv_nmi_action,"dump" ,strlen (uv_nmi_action)); }/* Pause as all CPU's enter the NMI handler */
Signature · 1 line
2.15.2
Quoted 2 lines · On Sat, Dec 3, 2022 at 8:24 AM <[email protected]> wrote:
The implementation of
strscpy()is more robust and safer. That's now the recommended way to copy NUL terminated strings.
...
arch/x86/platform/uv/uv_nmi.c static int param_set_action(const char *val, const struct kernel_param *kp) · line 208
Quoted 4 lines
/* (remove possible '\n') */arch/x86/platform/uv/uv_nmi.c +1
-2-strncpy (arg, val,ACTION_LEN -1 ); - arg[ACTION_LEN -1 ] ='\0' ; +strscpy (arg, val,ACTION_LEN -1 );
Should be ACTION_LEN here, no?
Quoted 3 lines
p = strchr(arg, '\n');
if (p)
*p = '\0';Wouldn't be better to refactor this
p = strnchrnul(val, ACTION_LEN, '\n');strscpy(arg, val, p - val);
?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 1 line · Andy Shevchenko
On Sat, Dec 3, 2022 at 8:24 AM <[email protected]> wrote:
...
Quoted 7 lines
arch/x86/platform/uv/uv_nmi.c static int param_set_action(const char *val, const struct kernel_param *kp) · line 208
Quoted 4 lines
/* (remove possible '\n') */arch/x86/platform/uv/uv_nmi.c +1
-2-strncpy (arg, val,ACTION_LEN -1 ); - arg[ACTION_LEN -1 ] ='\0' ; +strscpy (arg, val,ACTION_LEN -1 );Should be
ACTION_LENhere, no?
Quoted 8 lines
Quoted 3 lines
p = strchr(arg, '\n'); if (p) *p = '\0';Wouldn't be better to refactor this
p =
strnchrnul(val, ACTION_LEN, '\n');strscpy(arg, val, p - val);
Or even drop p completely
strscpy(arg, val, strnchrnul(val, ACTION_LEN, '\n') - val);
Signature · 2 lines
With Best Regards, Andy Shevchenko