mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 00:33:16 +00:00
init/version.c: Replace strlcpy with strscpy
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:
parent
215199e3d9
commit
8ebab155ea
@ -21,10 +21,10 @@ static int __init early_hostname(char *arg)
|
||||
{
|
||||
size_t bufsize = sizeof(init_uts_ns.name.nodename);
|
||||
size_t maxlen = bufsize - 1;
|
||||
size_t arglen;
|
||||
ssize_t arglen;
|
||||
|
||||
arglen = strlcpy(init_uts_ns.name.nodename, arg, bufsize);
|
||||
if (arglen > maxlen) {
|
||||
arglen = strscpy(init_uts_ns.name.nodename, arg, bufsize);
|
||||
if (arglen < 0) {
|
||||
pr_warn("hostname parameter exceeds %zd characters and will be truncated",
|
||||
maxlen);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user