Merge tag 'v4.14.51' into v4.14-rt

This is the 4.14.51 stable release

 Conflicts:
	include/linux/sched.h
	kernel/stop_machine.c

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index ce4a210d45a6..f5dcd63f37aa 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1694,6 +1694,12 @@ void task_dump_owner(struct task_struct *task, mode_t mode,
 	kuid_t uid;
 	kgid_t gid;
 
+	if (unlikely(task->flags & PF_KTHREAD)) {
+		*ruid = GLOBAL_ROOT_UID;
+		*rgid = GLOBAL_ROOT_GID;
+		return;
+	}
+
 	/* Default to the tasks effective ownership */
 	rcu_read_lock();
 	cred = __task_cred(task);