From: Yafang Shao <laoar.shao@gmail.com>
To: akpm@linux-foundation.org, keescook@chromium.org,
rostedt@goodmis.org, mathieu.desnoyers@efficios.com,
arnaldo.melo@gmail.com, pmladek@suse.com, peterz@infradead.org,
viro@zeniv.linux.org.uk, valentin.schneider@arm.com,
qiang.zhang@windriver.com, robdclark@chromium.org,
christian@brauner.io, dietmar.eggemann@arm.com, mingo@redhat.com,
juri.lelli@redhat.com, vincent.guittot@linaro.org,
davem@davemloft.net, kuba@kernel.org, ast@kernel.org,
daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com,
songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com,
kpsingh@kernel.org, dennis.dalessandro@cornelisnetworks.com,
mike.marciniszyn@cornelisnetworks.com, dledford@redhat.com,
jgg@ziepe.ca
Cc: linux-rdma@vger.kernel.org, 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>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>
Subject: [PATCH v7 05/11] fs/binfmt_elf: make prpsinfo always get a nul terminated task comm
Date: Mon, 1 Nov 2021 06:04:13 +0000 [thread overview]
Message-ID: <20211101060419.4682-6-laoar.shao@gmail.com> (raw)
In-Reply-To: <20211101060419.4682-1-laoar.shao@gmail.com>
kernel test robot reported a -Wstringop-truncation warning after I
extend task comm from 16 to 24. Below is the detailed warning:
fs/binfmt_elf.c: In function 'fill_psinfo.isra':
>> fs/binfmt_elf.c:1575:9: warning: 'strncpy' output may be truncated copying 16 bytes from a string of length 23 [-Wstringop-truncation]
1575 | strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Replacing the open-coded strncpy() with the helper get_task_comm() can
avoid this warning.
As the struct prpsinfo is externally parsed, for example by the crash
utility, we can't change the size of pr_fname. So I just leave it as-is.
I also verfied if it still work well when I extend the comm size to 24.
struct elf_prpsinfo is used to dump the task information in userspace
coredump or kernel vmcore. Below is the verfication of vmcore,
crash> ps
PID PPID CPU TASK ST %MEM VSZ RSS COMM
0 0 0 ffffffff9d21a940 RU 0.0 0 0 [swapper/0]
> 0 0 1 ffffa09e40f85e80 RU 0.0 0 0 [swapper/1]
> 0 0 2 ffffa09e40f81f80 RU 0.0 0 0 [swapper/2]
> 0 0 3 ffffa09e40f83f00 RU 0.0 0 0 [swapper/3]
> 0 0 4 ffffa09e40f80000 RU 0.0 0 0 [swapper/4]
> 0 0 5 ffffa09e40f89f80 RU 0.0 0 0 [swapper/5]
0 0 6 ffffa09e40f8bf00 RU 0.0 0 0 [swapper/6]
> 0 0 7 ffffa09e40f88000 RU 0.0 0 0 [swapper/7]
> 0 0 8 ffffa09e40f8de80 RU 0.0 0 0 [swapper/8]
> 0 0 9 ffffa09e40f95e80 RU 0.0 0 0 [swapper/9]
> 0 0 10 ffffa09e40f91f80 RU 0.0 0 0 [swapper/10]
> 0 0 11 ffffa09e40f93f00 RU 0.0 0 0 [swapper/11]
> 0 0 12 ffffa09e40f90000 RU 0.0 0 0 [swapper/12]
> 0 0 13 ffffa09e40f9bf00 RU 0.0 0 0 [swapper/13]
> 0 0 14 ffffa09e40f98000 RU 0.0 0 0 [swapper/14]
> 0 0 15 ffffa09e40f9de80 RU 0.0 0 0 [swapper/15]
It works well as expected.
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Petr Mladek <pmladek@suse.com>
---
fs/binfmt_elf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index a813b70f594e..138956fd4a88 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1572,7 +1572,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
SET_UID(psinfo->pr_uid, from_kuid_munged(cred->user_ns, cred->uid));
SET_GID(psinfo->pr_gid, from_kgid_munged(cred->user_ns, cred->gid));
rcu_read_unlock();
- strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname));
+ get_task_comm(psinfo->pr_fname, p);
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2021-11-01 6:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 6:04 [PATCH v7 00/11] extend task comm from 16 to 24 Yafang Shao
2021-11-01 6:04 ` [PATCH v7 01/11] fs/exec: make __set_task_comm always set a nul terminated string Yafang Shao
2021-11-01 6:04 ` [PATCH v7 02/11] fs/exec: make __get_task_comm always get " Yafang Shao
2021-11-01 6:04 ` [PATCH v7 03/11] sched.h: use __must_be_array instead of BUILD_BUG_ON in get_task_comm Yafang Shao
2021-11-01 6:04 ` [PATCH v7 04/11] drivers/infiniband: make setup_ctxt always get a nul terminated task comm Yafang Shao
2021-11-01 6:04 ` Yafang Shao [this message]
2021-11-01 6:04 ` [PATCH v7 06/11] samples/bpf/test_overhead_kprobe_kern: make it adopt to task comm size change Yafang Shao
2021-11-01 6:04 ` [PATCH v7 07/11] tools/bpf/bpftool/skeleton: " Yafang Shao
2021-11-01 23:47 ` Andrii Nakryiko
2021-11-01 6:04 ` [PATCH v7 08/11] tools/perf/test: make perf test " Yafang Shao
2021-11-17 14:31 ` Arnaldo Carvalho de Melo
2021-11-18 14:18 ` Yafang Shao
2021-11-01 6:04 ` [PATCH v7 09/11] tools/testing/selftests/bpf: make it " Yafang Shao
2021-11-01 23:47 ` Andrii Nakryiko
2021-11-01 6:04 ` [PATCH v7 10/11] sched.h: extend task comm from 16 to 24 Yafang Shao
2021-11-01 6:04 ` [PATCH v7 11/11] kernel/kthread: show a warning if kthread's comm is truncated Yafang Shao
2021-11-01 12:44 ` [PATCH v7 00/11] extend task comm from 16 to 24 Matthew Wilcox
2021-11-01 13:12 ` Yafang Shao
2021-11-01 14:07 ` Petr Mladek
2021-11-01 14:34 ` Yafang Shao
2021-11-01 16:02 ` Petr Mladek
2021-11-01 16:06 ` Steven Rostedt
2021-11-02 1:09 ` Yafang Shao
2021-11-02 1:18 ` Steven Rostedt
2021-11-02 1:26 ` Yafang Shao
2021-11-02 7:56 ` Petr Mladek
2021-11-02 13:48 ` Yafang Shao
2021-11-02 9:26 ` David Hildenbrand
2021-11-04 1:37 ` Michał Mirosław
2021-11-05 6:34 ` Yafang Shao
2021-11-05 23:57 ` Michał Mirosław
2021-11-06 9:12 ` Yafang Shao
2021-11-06 11:29 ` Michał Mirosław
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=20211101060419.4682-6-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=christian@brauner.io \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=dietmar.eggemann@arm.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=john.fastabend@gmail.com \
--cc=juri.lelli@redhat.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.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=linux-rdma@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mike.marciniszyn@cornelisnetworks.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oliver.sang@intel.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=qiang.zhang@windriver.com \
--cc=robdclark@chromium.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=valentin.schneider@arm.com \
--cc=vincent.guittot@linaro.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yhs@fb.com \
/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).