From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
Azeem Shaikh <azeemshaikh38@gmail.com>
Subject: [for-linus][PATCH 04/11] tracing: Replace strlcpy with strscpy in trace/events/task.h
Date: Sat, 02 Sep 2023 07:50:39 -0400 [thread overview]
Message-ID: <20230902115118.838838036@goodmis.org> (raw)
In-Reply-To: 20230902115035.786076237@goodmis.org
From: Azeem Shaikh <azeemshaikh38@gmail.com>
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
Link: https://lore.kernel.org/linux-trace-kernel/20230831194212.1529941-1-azeemshaikh38@gmail.com
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
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.40.1
next prev parent reply other threads:[~2023-09-02 11:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 11:50 [for-linus][PATCH 00/11] tracing: Minor fixes for 6.6 Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 01/11] rv: Set variable da_mon_##name to static Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 02/11] tracing: Remove extra space at the end of hwlat_detector/mode Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 03/11] tracing: Fix race issue between cpu buffer write and swap Steven Rostedt
2023-09-02 11:50 ` Steven Rostedt [this message]
2023-09-02 11:50 ` [for-linus][PATCH 05/11] ftrace: Use within_module to check rec->ip within specified module Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 06/11] ftrace: Use LIST_HEAD to initialize clear_hash Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 07/11] tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 08/11] tracing/filters: Fix error-handling of cpulist parsing buffer Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 09/11] tracing/filters: Fix double-free of struct filter_pred.mask Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 10/11] tracing/filters: Change parse_pred() cpulist ternary into an if block Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 11/11] tracing/filters: Fix coding style issues Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230902115118.838838036@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=azeemshaikh38@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox