From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 28 Apr 2020 18:00:39 +0000 (-0500)
Subject: posix-cpu-timer:  Unify the now redundant code in lookup_task
X-Git-Tag: v5.8-rc1~145^2~3^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7f5194054e103d18d267385b866b5b90511a425;p=thirdparty%2Fkernel%2Flinux.git

posix-cpu-timer:  Unify the now redundant code in lookup_task

Now that both !thread paths through lookup_task call
thread_group_leader, unify them into the single test at the end of
lookup_task.

This unification just makes it clear what is happening in the gettime
special case of lookup_task.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index e4051e417bcb8..b7f972fb115ef 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -66,14 +66,13 @@ static struct task_struct *lookup_task(const pid_t pid, bool thread,
 	if (thread)
 		return same_thread_group(p, current) ? p : NULL;
 
-	if (gettime) {
-		/*
-		 * For clock_gettime(PROCESS) the task does not need to be
-		 * the actual group leader. task->signal gives
-		 * access to the group's clock.
-		 */
-		return (p == current || thread_group_leader(p)) ? p : NULL;
-	}
+	/*
+	 * For clock_gettime(PROCESS) the task does not need to be
+	 * the actual group leader. task->signal gives
+	 * access to the group's clock.
+	 */
+	if (gettime && (p == current))
+		return p;
 
 	/*
 	 * For processes require that p is group leader.