From: Yafang Shao <laoar.shao@gmail.com>
To: keescook@chromium.org, rostedt@goodmis.org, peterz@infradead.org,
pmladek@suse.com, viro@zeniv.linux.org.uk,
akpm@linux-foundation.org, valentin.schneider@arm.com,
mathieu.desnoyers@efficios.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,
bsegall@google.com, mgorman@suse.de, bristot@redhat.com,
davem@davemloft.net, kuba@kernel.org
Cc: linux-kernel@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com>,
kernel test robot <lkp@intel.com>
Subject: [PATCH v4 1/5] elfcore: use TASK_COMM_LEN instead of 16 in prpsinfo
Date: Wed, 13 Oct 2021 10:23:42 +0000 [thread overview]
Message-ID: <20211013102346.179642-2-laoar.shao@gmail.com> (raw)
In-Reply-To: <20211013102346.179642-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));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This patch can fix this warning.
struct elf_prpsinfo was moved from include/uapi/linux/elfcore.h into
include/linux/elfcore.h in commit
1e6b57d6421f ("unexport linux/elfcore.h")
As it is not UAPI code, we can replace 16 with TASK_COMM_LEN without
worrying about breaking userspace things.
struct elf_prpsinfo is used to dump the task information in userspace
coredump or kernel vmcore. So I verified what will happen to vmcore if
I extend the size of TASK_COMM_LEN to 24. The result is that the vmcore
still work fine as expected, for example:
crash> ps
PID PPID CPU TASK ST %MEM VSZ RSS COMM
> 0 0 0 ffffffff8501a940 RU 0.0 0 0 [swapper/0]
> 0 0 1 ffff996e00f81f80 RU 0.0 0 0 [swapper/1]
> 0 0 2 ffff996e00f80000 RU 0.0 0 0 [swapper/2]
> 0 0 3 ffff996e00f85e80 RU 0.0 0 0 [swapper/3]
> 0 0 4 ffff996e00f83f00 RU 0.0 0 0 [swapper/4]
0 0 5 ffff996e00f8de80 RU 0.0 0 0 [swapper/5]
> 0 0 6 ffff996e00f8bf00 RU 0.0 0 0 [swapper/6]
> 0 0 7 ffff996e00f89f80 RU 0.0 0 0 [swapper/7]
> 0 0 8 ffff996e00f88000 RU 0.0 0 0 [swapper/8]
> 0 0 9 ffff996e00f93f00 RU 0.0 0 0 [swapper/9]
> 0 0 10 ffff996e00f91f80 RU 0.0 0 0 [swapper/10]
> 0 0 11 ffff996e00f90000 RU 0.0 0 0 [swapper/11]
> 0 0 12 ffff996e00f95e80 RU 0.0 0 0 [swapper/12]
> 0 0 13 ffff996e00f98000 RU 0.0 0 0 [swapper/13]
> 0 0 14 ffff996e00f9de80 RU 0.0 0 0 [swapper/14]
> 0 0 15 ffff996e00f9bf00 RU 0.0 0 0 [swapper/15]
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Petr Mladek <pmladek@suse.com>
---
include/linux/elfcore-compat.h | 2 +-
include/linux/elfcore.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/elfcore-compat.h b/include/linux/elfcore-compat.h
index e272c3d452ce..8a52a782161d 100644
--- a/include/linux/elfcore-compat.h
+++ b/include/linux/elfcore-compat.h
@@ -43,7 +43,7 @@ struct compat_elf_prpsinfo
__compat_uid_t pr_uid;
__compat_gid_t pr_gid;
compat_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;
- char pr_fname[16];
+ char pr_fname[TASK_COMM_LEN];
char pr_psargs[ELF_PRARGSZ];
};
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 2aaa15779d50..ff4e4e455160 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -65,8 +65,8 @@ struct elf_prpsinfo
__kernel_gid_t pr_gid;
pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;
/* Lots missing */
- char pr_fname[16]; /* filename of executable */
- char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
+ char pr_fname[TASK_COMM_LEN]; /* filename of executable */
+ char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
};
static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
--
2.17.1
next prev parent reply other threads:[~2021-10-13 10:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 10:23 [PATCH v4 0/5] task_struct: extend task comm from 16 to 24 for CONFIG_BASE_FULL Yafang Shao
2021-10-13 10:23 ` Yafang Shao [this message]
2021-10-13 13:11 ` [PATCH v4 1/5] elfcore: use TASK_COMM_LEN instead of 16 in prpsinfo Steven Rostedt
2021-10-14 1:46 ` Yafang Shao
2021-10-13 10:23 ` [PATCH v4 2/5] connector: use __get_task_comm in proc_comm_connector Yafang Shao
2021-10-13 14:19 ` Steven Rostedt
2021-10-14 1:48 ` Yafang Shao
2021-10-14 2:24 ` Steven Rostedt
2021-10-14 2:42 ` Yafang Shao
2021-10-14 4:50 ` Kees Cook
2021-10-14 9:26 ` Yafang Shao
2021-10-14 13:31 ` Steven Rostedt
2021-10-13 10:23 ` [PATCH v4 3/5] fs/exec: use strscpy instead of strlcpy in __set_task_comm Yafang Shao
2021-10-13 10:23 ` [PATCH v4 4/5] sched.h: extend task comm from 16 to 24 for CONFIG_BASE_FULL Yafang Shao
2021-10-13 10:23 ` [PATCH v4 5/5] kernel/kthread: show a warning if kthread's comm is truncated 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=20211013102346.179642-2-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=bristot@redhat.com \
--cc=bsegall@google.com \
--cc=christian@brauner.io \
--cc=davem@davemloft.net \
--cc=dietmar.eggemann@arm.com \
--cc=juri.lelli@redhat.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=qiang.zhang@windriver.com \
--cc=robdclark@chromium.org \
--cc=rostedt@goodmis.org \
--cc=valentin.schneider@arm.com \
--cc=vincent.guittot@linaro.org \
--cc=viro@zeniv.linux.org.uk \
/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).