Commit 2ac36cc6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

exec: avoid gcc-8 warning for get_task_comm

commit 3756f640 upstream.

gcc-8 warns about using strncpy() with the source size as the limit:

  fs/exec.c:1223:32: error: argument to 'sizeof' in 'strncpy' call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess]

This is indeed slightly suspicious, as it protects us from source
arguments without NUL-termination, but does not guarantee that the
destination is terminated.

This keeps the strncpy() to ensure we have properly padded target
buffer, but ensures that we use the correct length, by passing the
actual length of the destination buffer as well as adding a build-time
check to ensure it is exactly TASK_COMM_LEN.

There are only 23 callsites which I all reviewed to ensure this is
currently the case.  We could get away with doing only the check or
passing the right length, but it doesn't hurt to do both.

Link: default avatarArnd Bergmann <>
Suggested-by: default avatarKees Cook <>
Acked-by: default avatarKees Cook <>
Acked-by: default avatarIngo Molnar <>
Cc: Alexander Viro <>
Cc: Peter Zijlstra <>
Cc: Serge Hallyn <>
Cc: James Morris <>
Cc: Aleksa Sarai <>
Cc: "Eric W. Biederman" <>
Cc: Frederic Weisbecker <>
Cc: Thomas Gleixner <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 5b8cc588
......@@ -1077,15 +1077,14 @@ killed:
return -EAGAIN;
char *get_task_comm(char *buf, struct task_struct *tsk)
char *__get_task_comm(char *buf, size_t buf_size, struct task_struct *tsk)
/* buf must be at least sizeof(tsk->comm) in size */
strncpy(buf, tsk->comm, sizeof(tsk->comm));
strncpy(buf, tsk->comm, buf_size);
return buf;
* These functions flushes out all traces of the currently running executable
......@@ -2668,7 +2668,12 @@ static inline void set_task_comm(struct task_struct *tsk, const char *from)
__set_task_comm(tsk, from, false);
extern char *get_task_comm(char *to, struct task_struct *tsk);
extern char *__get_task_comm(char *to, size_t len, struct task_struct *tsk);
#define get_task_comm(buf, tsk) ({ \
BUILD_BUG_ON(sizeof(buf) != TASK_COMM_LEN); \
__get_task_comm(buf, sizeof(buf), tsk); \
void scheduler_ipi(void);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment