Skip to content

Commit e0bbf92

Browse files
JustinStittkees
authored andcommitted
um,ethertap: Replace deprecated strncpy() with strscpy()
`strncpy` is deprecated for use on NUL-terminated destination strings [1]. `gate_buf` should always be NUL-terminated and does not require NUL-padding. It is used as a string arg inside an argv array given to `run_helper()`. Due to this, let's use `strscpy` as it guarantees NUL-terminated on the destination buffer preventing potential buffer overreads [2]. This exact invocation was changed from `strcpy` to `strncpy` in commit 7879b1d ("um,ethertap: use strncpy") back in 2015. Let's continue hardening our `str*cpy` apis and use the newer and safer `strscpy`! 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: KSPP#90 Cc: linux-hardening@vger.kernel.org Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20230911-strncpy-arch-um-os-linux-drivers-ethertap_user-c-v1-1-d9e53f52ab32@google.com Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent d770084 commit e0bbf92

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/um/os-Linux/drivers/ethertap_user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static int etap_tramp(char *dev, char *gate, int control_me,
105105
sprintf(data_fd_buf, "%d", data_remote);
106106
sprintf(version_buf, "%d", UML_NET_VERSION);
107107
if (gate != NULL) {
108-
strncpy(gate_buf, gate, 15);
108+
strscpy(gate_buf, gate, sizeof(gate_buf));
109109
args = setup_args;
110110
}
111111
else args = nosetup_args;

0 commit comments

Comments
 (0)