Skip to content

Commit 1e6f01f

Browse files
JustinStittIngo Molnar
authored andcommitted
x86/platform/uv: Refactor code using deprecated strcpy()/strncpy() interfaces to use strscpy()
Both `strncpy` and `strcpy` are deprecated for use on NUL-terminated destination strings [1]. A suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on its destination buffer argument which is _not_ the case for `strncpy` or `strcpy`! In this case, we can drop both the forced NUL-termination and the `... -1` from: | strncpy(arg, val, ACTION_LEN - 1); as `strscpy` implicitly has this behavior. Also include slight refactor to code removing possible new-line chars as per Yang Yang's work at [3]. This reduces code size and complexity by using more robust and better understood interfaces. Co-developed-by: Yang Yang <yang.yang29@zte.com.cn> Signed-off-by: Justin Stitt <justinstitt@google.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Kees Cook <keescook@chromium.org> Cc: Dimitri Sivanich <sivanich@hpe.com> Link: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings[1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://lore.kernel.org/all/202212091545310085328@zte.com.cn/ [3] Link: KSPP#90 Link: https://lore.kernel.org/r/20230824-strncpy-arch-x86-platform-uv-uv_nmi-v2-1-e16d9a3ec570@google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 8874a41 commit 1e6f01f

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/x86/platform/uv/uv_nmi.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,21 +202,17 @@ static int param_set_action(const char *val, const struct kernel_param *kp)
202202
{
203203
int i;
204204
int n = ARRAY_SIZE(valid_acts);
205-
char arg[ACTION_LEN], *p;
205+
char arg[ACTION_LEN];
206206

207207
/* (remove possible '\n') */
208-
strncpy(arg, val, ACTION_LEN - 1);
209-
arg[ACTION_LEN - 1] = '\0';
210-
p = strchr(arg, '\n');
211-
if (p)
212-
*p = '\0';
208+
strscpy(arg, val, strnchrnul(val, sizeof(arg)-1, '\n') - val + 1);
213209

214210
for (i = 0; i < n; i++)
215211
if (!strcmp(arg, valid_acts[i].action))
216212
break;
217213

218214
if (i < n) {
219-
strcpy(uv_nmi_action, arg);
215+
strscpy(uv_nmi_action, arg, sizeof(uv_nmi_action));
220216
pr_info("UV: New NMI action:%s\n", uv_nmi_action);
221217
return 0;
222218
}
@@ -959,7 +955,7 @@ static int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
959955

960956
/* Unexpected return, revert action to "dump" */
961957
if (master)
962-
strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action));
958+
strscpy(uv_nmi_action, "dump", sizeof(uv_nmi_action));
963959
}
964960

965961
/* Pause as all CPU's enter the NMI handler */

0 commit comments

Comments
 (0)