diff options
| author | Azeem Shaikh <azeemshaikh38@gmail.com> | 2023-08-30 16:08:06 +0000 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2023-09-22 09:50:56 -0700 |
| commit | 8ebab155ea18a6d6c47b17287a0ab4633334f6eb (patch) | |
| tree | c08b62198e3df102ef467f369d3be074857ead9d | |
| parent | 215199e3d9f3dc01a6d10b8229891e6f7f1085e7 (diff) | |
| download | lwn-8ebab155ea18a6d6c47b17287a0ab4633334f6eb.tar.gz lwn-8ebab155ea18a6d6c47b17287a0ab4633334f6eb.zip | |
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>
| -rw-r--r-- | init/version.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/version.c b/init/version.c index f117921811b4..94c96f6fbfe6 100644 --- a/init/version.c +++ b/init/version.c @@ -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); } |