From: Yafang Shao <laoar.shao@gmail.com>
To: akpm@linux-foundation.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-perf-users@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
oliver.sang@intel.com, lkp@intel.com,
Yafang Shao <laoar.shao@gmail.com>,
Kees Cook <keescook@chromium.org>,
Steven Rostedt <rostedt@goodmis.org>,
David Hildenbrand <david@redhat.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Michal Miroslaw <mirq-linux@rere.qmqm.pl>,
Peter Zijlstra <peterz@infradead.org>,
Matthew Wilcox <willy@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>, Petr Mladek <pmladek@suse.com>
Subject: [PATCH v2 2/7] fs/exec: replace strncpy with strscpy_pad in __get_task_comm
Date: Sat, 20 Nov 2021 11:27:33 +0000 [thread overview]
Message-ID: <20211120112738.45980-3-laoar.shao@gmail.com> (raw)
In-Reply-To: <20211120112738.45980-1-laoar.shao@gmail.com>
If the dest buffer size is smaller than sizeof(tsk->comm), the buffer
will be without null ternimator, that may cause problem. Using
strscpy_pad() instead of strncpy() in __get_task_comm() can make the string
always nul ternimated and zero padded.
Suggested-by: Kees Cook <keescook@chromium.org>
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Petr Mladek <pmladek@suse.com>
---
fs/exec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/exec.c b/fs/exec.c
index 51d3cb4e3cdf..fa142638b191 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1207,7 +1207,8 @@ static int unshare_sighand(struct task_struct *me)
char *__get_task_comm(char *buf, size_t buf_size, struct task_struct *tsk)
{
task_lock(tsk);
- strncpy(buf, tsk->comm, buf_size);
+ /* Always NUL terminated and zero-padded */
+ strscpy_pad(buf, tsk->comm, buf_size);
task_unlock(tsk);
return buf;
}
--
2.17.1
next prev parent reply other threads:[~2021-11-20 11:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-20 11:27 [PATCH v2 0/7] task comm cleanups Yafang Shao
2021-11-20 11:27 ` [PATCH v2 1/7] fs/exec: replace strlcpy with strscpy_pad in __set_task_comm Yafang Shao
2021-11-20 11:27 ` Yafang Shao [this message]
2021-11-20 11:27 ` [PATCH v2 3/7] drivers/infiniband: replace open-coded string copy with get_task_comm Yafang Shao
2021-11-20 11:27 ` [PATCH v2 4/7] fs/binfmt_elf: " Yafang Shao
2021-11-29 16:01 ` Steven Rostedt
2021-11-30 3:01 ` Yafang Shao
2021-11-30 14:22 ` Steven Rostedt
2021-11-30 15:53 ` Yafang Shao
2021-11-20 11:27 ` [PATCH v2 5/7] samples/bpf/test_overhead_kprobe_kern: replace bpf_probe_read_kernel with bpf_probe_read_kernel_str to get task comm Yafang Shao
2021-11-20 11:27 ` [PATCH v2 6/7] tools/bpf/bpftool/skeleton: " Yafang Shao
2021-11-20 11:27 ` [PATCH v2 7/7] tools/testing/selftests/bpf: replace open-coded 16 with TASK_COMM_LEN Yafang Shao
2021-11-29 10:13 ` Sven Schnelle
2021-11-29 13:41 ` Yafang Shao
2021-11-29 14:21 ` Sven Schnelle
2021-11-29 14:32 ` David Hildenbrand
2021-11-29 14:38 ` Sven Schnelle
2021-11-29 15:33 ` Yafang Shao
2021-11-29 16:07 ` Steven Rostedt
2021-11-29 16:08 ` Steven Rostedt
2021-11-29 15:28 ` Yafang Shao
2021-11-29 17:30 ` Steven Rostedt
2021-11-29 17:56 ` Sven Schnelle
2021-11-30 3:03 ` Yafang Shao
2021-11-30 14:23 ` Steven Rostedt
2021-11-30 15:46 ` Yafang Shao
2023-02-08 21:55 ` John Stultz
2023-02-09 0:10 ` Alexei Starovoitov
2023-02-09 0:54 ` John Stultz
2023-02-09 2:06 ` Mathieu Desnoyers
2023-02-09 6:20 ` Yafang Shao
2023-02-09 14:27 ` Kajetan Puchalski
2023-02-09 15:37 ` Yafang Shao
2023-02-10 18:09 ` Kajetan Puchalski
2023-02-11 16:51 ` Qais Yousef
2023-02-12 3:19 ` Yafang Shao
2023-02-09 2:28 ` Steven Rostedt
2023-02-09 2:33 ` Steven Rostedt
2023-02-11 19:00 ` Steven Rostedt
2023-02-12 3:38 ` Yafang Shao
2023-02-12 3:44 ` Steven Rostedt
2023-02-13 17:43 ` Namhyung Kim
2023-02-13 17:46 ` Mathieu Desnoyers
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=20211120112738.45980-3-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii.nakryiko@gmail.com \
--cc=arnaldo.melo@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=david@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mirq-linux@rere.qmqm.pl \
--cc=netdev@vger.kernel.org \
--cc=oliver.sang@intel.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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).