Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/binfmt_elf: replace open-coded string copy with get_task_comm

It is better to use get_task_comm() instead of the open coded string
copy as we do in other places.

struct elf_prpsinfo is used to dump the task information in userspace
coredump or kernel vmcore. Below is the verification 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.

Some comments are added to explain why we use the hard-coded 16.

Link: https://lkml.kernel.org/r/20211120112738.45980-5-laoar.shao@gmail.com
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Reviewed-by: David Hildenbrand <david@redhat.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: 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>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Yafang Shao and committed by
Linus Torvalds
95af469c 7b6397d7

+11 -1
+1 -1
fs/binfmt_elf.c
··· 1585 1585 SET_UID(psinfo->pr_uid, from_kuid_munged(cred->user_ns, cred->uid)); 1586 1586 SET_GID(psinfo->pr_gid, from_kgid_munged(cred->user_ns, cred->gid)); 1587 1587 rcu_read_unlock(); 1588 - strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname)); 1588 + get_task_comm(psinfo->pr_fname, p); 1589 1589 1590 1590 return 0; 1591 1591 }
+5
include/linux/elfcore-compat.h
··· 43 43 __compat_uid_t pr_uid; 44 44 __compat_gid_t pr_gid; 45 45 compat_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; 46 + /* 47 + * The hard-coded 16 is derived from TASK_COMM_LEN, but it can't be 48 + * changed as it is exposed to userspace. We'd better make it hard-coded 49 + * here. 50 + */ 46 51 char pr_fname[16]; 47 52 char pr_psargs[ELF_PRARGSZ]; 48 53 };
+5
include/linux/elfcore.h
··· 65 65 __kernel_gid_t pr_gid; 66 66 pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; 67 67 /* Lots missing */ 68 + /* 69 + * The hard-coded 16 is derived from TASK_COMM_LEN, but it can't be 70 + * changed as it is exposed to userspace. We'd better make it hard-coded 71 + * here. 72 + */ 68 73 char pr_fname[16]; /* filename of executable */ 69 74 char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ 70 75 };