From: Yafang Shao <laoar.shao@gmail.com>
To: torvalds@linux-foundation.org, laoar.shao@gmail.com
Cc: akpm@linux-foundation.org, alexei.starovoitov@gmail.com,
audit@vger.kernel.org, bpf@vger.kernel.org,
catalin.marinas@arm.com, dri-devel@lists.freedesktop.org,
ebiederm@xmission.com, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-security-module@vger.kernel.org,
linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org,
penguin-kernel@i-love.sakura.ne.jp, rostedt@goodmis.org,
selinux@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [PATCH v4 09/11] tracing: Replace strncpy() with __get_task_comm()
Date: Fri, 28 Jun 2024 17:05:15 +0800 [thread overview]
Message-ID: <20240628090517.17994-9-laoar.shao@gmail.com> (raw)
In-Reply-To: <20240628090517.17994-1-laoar.shao@gmail.com>
Using __get_task_comm() to read the task comm ensures that the name is
always NUL-terminated, regardless of the source string. This approach also
facilitates future extensions to the task comm.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
kernel/trace/trace.c | 2 +-
kernel/trace/trace_events_hist.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 578a49ff5c32..ce94a86154a2 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1907,7 +1907,7 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)
max_data->critical_start = data->critical_start;
max_data->critical_end = data->critical_end;
- strncpy(max_data->comm, tsk->comm, TASK_COMM_LEN);
+ __get_task_comm(max_data->comm, TASK_COMM_LEN, tsk);
max_data->pid = tsk->pid;
/*
* If tsk == current, then use current_uid(), as that does not use
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 6ece1308d36a..721d4758a79f 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -1599,7 +1599,7 @@ static inline void save_comm(char *comm, struct task_struct *task)
return;
}
- strncpy(comm, task->comm, TASK_COMM_LEN);
+ __get_task_comm(comm, TASK_COMM_LEN, task);
}
static void hist_elt_data_free(struct hist_elt_data *elt_data)
--
2.43.5
next prev parent reply other threads:[~2024-06-28 9:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 8:57 [PATCH v4 00/11] Improve the copy of task comm Yafang Shao
2024-06-28 9:05 ` [PATCH v4 01/11] fs/exec: Drop task_lock() inside __get_task_comm() Yafang Shao
2024-06-28 9:05 ` [PATCH v4 02/11] auditsc: Replace memcpy() with __get_task_comm() Yafang Shao
2024-06-28 9:05 ` [PATCH v4 03/11] security: " Yafang Shao
2024-06-28 9:05 ` [PATCH v4 04/11] bpftool: Ensure task comm is always NUL-terminated Yafang Shao
2024-06-28 9:05 ` [PATCH v4 05/11] mm/util: Fix possible race condition in kstrdup() Yafang Shao
2024-06-28 9:05 ` [PATCH v4 06/11] mm/util: Deduplicate code in {kstrdup,kstrndup,kmemdup_nul} Yafang Shao
2024-06-28 9:05 ` [PATCH v4 07/11] mm/kmemleak: Replace strncpy() with __get_task_comm() Yafang Shao
2024-06-28 9:05 ` [PATCH v4 08/11] tsacct: " Yafang Shao
2024-06-28 9:05 ` Yafang Shao [this message]
2024-06-28 9:05 ` [PATCH v4 10/11] net: Replace strcpy() " Yafang Shao
2024-06-28 9:05 ` [PATCH v4 11/11] drm: " Yafang Shao
-- strict thread matches above, loose matches on Subject: below --
2024-07-29 2:37 [PATCH resend v4 00/11] Improve the copy of task comm Yafang Shao
2024-07-29 2:37 ` [PATCH v4 09/11] tracing: Replace strncpy() with __get_task_comm() Yafang Shao
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=20240628090517.17994-9-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alexei.starovoitov@gmail.com \
--cc=audit@vger.kernel.org \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=ebiederm@xmission.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=rostedt@goodmis.org \
--cc=selinux@vger.kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).