linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yafang Shao <laoar.shao@gmail.com>
To: torvalds@linux-foundation.org
Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
	linux-trace-kernel@vger.kernel.org, audit@vger.kernel.org,
	linux-security-module@vger.kernel.org, selinux@vger.kernel.org,
	bpf@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com>,
	Quentin Monnet <qmo@kernel.org>
Subject: [PATCH 5/6] bpftool: Make task comm always be NUL-terminated
Date: Sun,  2 Jun 2024 10:37:53 +0800	[thread overview]
Message-ID: <20240602023754.25443-6-laoar.shao@gmail.com> (raw)
In-Reply-To: <20240602023754.25443-1-laoar.shao@gmail.com>

Let's explicitly ensure the destination string is NUL-terminated. This way,
it won't be affected by changes to the source string.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Cc: Quentin Monnet <qmo@kernel.org>
---
 tools/bpf/bpftool/pids.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/bpf/bpftool/pids.c b/tools/bpf/bpftool/pids.c
index 9b898571b49e..23f488cf1740 100644
--- a/tools/bpf/bpftool/pids.c
+++ b/tools/bpf/bpftool/pids.c
@@ -54,6 +54,7 @@ static void add_ref(struct hashmap *map, struct pid_iter_entry *e)
 		ref = &refs->refs[refs->ref_cnt];
 		ref->pid = e->pid;
 		memcpy(ref->comm, e->comm, sizeof(ref->comm));
+		ref->comm[sizeof(ref->comm) - 1] = '\0';
 		refs->ref_cnt++;
 
 		return;
@@ -77,6 +78,7 @@ static void add_ref(struct hashmap *map, struct pid_iter_entry *e)
 	ref = &refs->refs[0];
 	ref->pid = e->pid;
 	memcpy(ref->comm, e->comm, sizeof(ref->comm));
+	ref->comm[sizeof(ref->comm) - 1] = '\0';
 	refs->ref_cnt = 1;
 	refs->has_bpf_cookie = e->has_bpf_cookie;
 	refs->bpf_cookie = e->bpf_cookie;
-- 
2.39.1


  parent reply	other threads:[~2024-06-02  2:38 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-02  2:37 [PATCH 0/6] kernel: Avoid memcpy of task comm Yafang Shao
2024-06-02  2:37 ` [PATCH 1/6] fs/exec: Drop task_lock() inside __get_task_comm() Yafang Shao
2024-06-02  3:51   ` Eric W. Biederman
2024-06-02  6:56     ` Yafang Shao
2024-06-02 16:35       ` Alexei Starovoitov
2024-06-02 17:52         ` Eric W. Biederman
2024-06-02 18:23           ` Alexei Starovoitov
2024-06-03 11:35             ` Yafang Shao
2024-06-10 12:34             ` Eric W. Biederman
2024-06-10 23:01               ` Alexei Starovoitov
2024-06-02 20:11           ` Linus Torvalds
2024-06-02 17:56       ` Eric W. Biederman
2024-06-04 13:02   ` Matus Jokay
2024-06-04 20:01   ` Matus Jokay
2024-06-05  2:48     ` Yafang Shao
2024-06-02  2:37 ` [PATCH 2/6] tracing: Replace memcpy() with __get_task_comm() Yafang Shao
2024-06-03 21:20   ` Steven Rostedt
2024-06-03 21:42     ` Linus Torvalds
2024-06-03 22:19       ` Steven Rostedt
2024-06-03 22:23         ` Linus Torvalds
2024-06-03 22:37           ` Steven Rostedt
2024-06-03 22:38             ` Linus Torvalds
2024-06-03 22:40             ` Steven Rostedt
2024-06-04  2:35               ` Yafang Shao
2024-06-02  2:37 ` [PATCH 3/6] auditsc: " Yafang Shao
2024-06-03 21:03   ` Paul Moore
2024-06-02  2:37 ` [PATCH 4/6] security: " Yafang Shao
2024-06-03 22:06   ` Paul Moore
2024-06-02  2:37 ` Yafang Shao [this message]
2024-06-02 21:01   ` [PATCH 5/6] bpftool: Make task comm always be NUL-terminated Quentin Monnet
2024-06-02  2:46 ` [PATCH 6/6] selftests/bpf: Replace memcpy() 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=20240602023754.25443-6-laoar.shao@gmail.com \
    --to=laoar.shao@gmail.com \
    --cc=audit@vger.kernel.org \
    --cc=bpf@vger.kernel.org \
    --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=qmo@kernel.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).