From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 29 Apr 2009 16:01:23 +0000 (+0200)
Subject: do_wait: do take security_task_wait() into account
X-Git-Tag: firefly_0821_release~13985^2^2~36
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78a3d9d5654a7fd99cf8b2ab06b9497b9c7aad64;p=firefly-linux-kernel-4.4.55.git

do_wait: do take security_task_wait() into account

I was never able to understand what should we actually do when
security_task_wait() fails, but the current code doesn't look right.

If ->task_wait() returns the error, we update *notask_error correctly.
But then we either reap the child (despite the fact this was forbidden)
or clear *notask_error (and hide the securiy policy problems).

This patch assumes that "stolen by ptrace" doesn't matter. If selinux
denies the child we should ignore it but make sure we report -EACCESS
instead of -ECHLD if there are no other eligible children.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/kernel/exit.c b/kernel/exit.c
index 167e1e3ad7c6..d2e8239ea187 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1582,6 +1582,7 @@ static int wait_consider_task(struct task_struct *parent, int ptrace,
 		 */
 		if (*notask_error)
 			*notask_error = ret;
+		return 0;
 	}
 
 	if (likely(!ptrace) && unlikely(p->ptrace)) {