kobject: Replace strlcpy with strscpy
Subsystems (2)
PATCH v4 1/1 kobject: 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
---
v4:
* Fixes errors reported by checkpatch.pl
v3:
* Fixed weird indentation.
* https://lore.kernel.org/all/[email protected]/
v2:
* Updated error message to remove @len which is errno now.
* https://lore.kernel.org/all/[email protected]/
v1:
* https://lore.kernel.org/all/[email protected]/
lib/kobject_uevent.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
lib/kobject_uevent.c +4 -4
@@ -254,10 +254,10 @@ static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem)int buffer_size =sizeof (env->buf) - env->buflen;int len; - len =strlcpy (&env->buf[env->buflen], subsystem, buffer_size); -if (len >= buffer_size) { -pr_warn ("init_uevent_argv: buffer size of %d too small, needed %d\n" , - buffer_size, len); + len =strscpy (&env->buf[env->buflen], subsystem, buffer_size); +if (len <0 ) { +pr_warn ("%s: insufficient buffer space (%u left) for %s\n" , + __func__, buffer_size, subsystem);return -ENOMEM ; }
--
2.42.0.283.g2d96d420d3-goog
Quoted 7 lines · Azeem Shaikh
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 removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
Quoted 7 lines
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/89Signed-off-by Azeem Shaikh <[email protected]>
Signature · 1 line
Kees Cook
Kees Cook
AppliedQuoted 8 lines · Azeem Shaikh
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 removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().[...]
Applied to for-next/hardening, thanks!
[1/1] kobject: Replace strlcpy with strscpy
https://git.kernel.org/kees/c/68a39dfd6f94
Take care,
Signature · 1 line
Kees Cook