* [PATCH] trace/events/task.h: Replace strlcpy with strscpy
@ 2023-08-31 19:42 Azeem Shaikh
2023-08-31 21:08 ` Kees Cook
2023-08-31 23:20 ` Justin Stitt
0 siblings, 2 replies; 3+ messages in thread
From: Azeem Shaikh @ 2023-08-31 19:42 UTC (permalink / raw)
To: Kees Cook
Cc: linux-hardening, Azeem Shaikh, linux-kernel, linux-trace-kernel,
Steven Rostedt, Masami Hiramatsu
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().
No return values were used, so direct replacement is safe.
[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>
---
include/trace/events/task.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/trace/events/task.h b/include/trace/events/task.h
index 64d160930b0d..47b527464d1a 100644
--- a/include/trace/events/task.h
+++ b/include/trace/events/task.h
@@ -47,7 +47,7 @@ TRACE_EVENT(task_rename,
TP_fast_assign(
__entry->pid = task->pid;
memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
- strlcpy(entry->newcomm, comm, TASK_COMM_LEN);
+ strscpy(entry->newcomm, comm, TASK_COMM_LEN);
__entry->oom_score_adj = task->signal->oom_score_adj;
),
--
2.42.0.283.g2d96d420d3-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] trace/events/task.h: Replace strlcpy with strscpy
2023-08-31 19:42 [PATCH] trace/events/task.h: Replace strlcpy with strscpy Azeem Shaikh
@ 2023-08-31 21:08 ` Kees Cook
2023-08-31 23:20 ` Justin Stitt
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-08-31 21:08 UTC (permalink / raw)
To: Azeem Shaikh
Cc: linux-hardening, linux-kernel, linux-trace-kernel, Steven Rostedt,
Masami Hiramatsu
On Thu, Aug 31, 2023 at 07:42:12PM +0000, Azeem Shaikh wrote:
> 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().
>
> No return values were used, so direct replacement is safe.
>
> [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: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] trace/events/task.h: Replace strlcpy with strscpy
2023-08-31 19:42 [PATCH] trace/events/task.h: Replace strlcpy with strscpy Azeem Shaikh
2023-08-31 21:08 ` Kees Cook
@ 2023-08-31 23:20 ` Justin Stitt
1 sibling, 0 replies; 3+ messages in thread
From: Justin Stitt @ 2023-08-31 23:20 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Kees Cook, linux-hardening, linux-kernel, linux-trace-kernel,
Steven Rostedt, Masami Hiramatsu
On Thu, Aug 31, 2023 at 12:42 PM Azeem Shaikh <azeemshaikh38@gmail.com> wrote:
>
> 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().
>
> No return values were used, so direct replacement is safe.
>
> [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>
> ---
> include/trace/events/task.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/trace/events/task.h b/include/trace/events/task.h
> index 64d160930b0d..47b527464d1a 100644
> --- a/include/trace/events/task.h
> +++ b/include/trace/events/task.h
> @@ -47,7 +47,7 @@ TRACE_EVENT(task_rename,
> TP_fast_assign(
> __entry->pid = task->pid;
> memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
> - strlcpy(entry->newcomm, comm, TASK_COMM_LEN);
> + strscpy(entry->newcomm, comm, TASK_COMM_LEN);
> __entry->oom_score_adj = task->signal->oom_score_adj;
> ),
>
> --
> 2.42.0.283.g2d96d420d3-goog
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-31 23:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-31 19:42 [PATCH] trace/events/task.h: Replace strlcpy with strscpy Azeem Shaikh
2023-08-31 21:08 ` Kees Cook
2023-08-31 23:20 ` Justin Stitt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox