Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

init/version.c: Replace strlcpy with strscpy

Browse Source 
strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().

Direct replacement is safe here since return value of -errno
is used to check for truncation instead of sizeof(dest).

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230830160806.3821893-1-azeemshaikh38@gmail.com
Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Azeem Shaikh 2023-08-30 16:08:06 +00:00 committed by Kees Cook
parent 215199e3d9
commit 8ebab155ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/version.c
View File

@ -21,10 +21,10 @@ static int __init early_hostname(char *arg)
{ {
size_t bufsize = sizeof(init_uts_ns.name.nodename); size_t bufsize = sizeof(init_uts_ns.name.nodename);
size_t maxlen = bufsize - 1; size_t maxlen = bufsize - 1;
size_t arglen; ssize_t arglen;
arglen = strlcpy(init_uts_ns.name.nodename, arg, bufsize); arglen = strscpy(init_uts_ns.name.nodename, arg, bufsize);
if (arglen > maxlen) { if (arglen < 0) {
pr_warn("hostname parameter exceeds %zd characters and will be truncated", pr_warn("hostname parameter exceeds %zd characters and will be truncated",
maxlen); maxlen);
} }