From 7c5f48eca7fc423c1194aef4fcfef66d8a3f8f30 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 29 Apr 2009 13:45:05 +0100
Subject: [PATCH] --- yaml --- r: 146415 b: refs/heads/master c:
 3bcac0263f0b45e67a64034ebcb69eb9abb742f4 h: refs/heads/master i:   146413:
 a628572cff13d9751952707cb684405cc465b2ed   146411:
 3d614f0e6668198f589d86602c0f1882b3aea1de   146407:
 67f48130f1c7e490dc31d9442b783035d22a3698   146399:
 851abf47a2f26e29b7572e38df9b5af5085b856a v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/sched.h    |  1 +
 trunk/kernel/signal.c          | 11 ++++++++---
 trunk/security/selinux/hooks.c |  9 +++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a47f41c41dd7..bf97fdf57e2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88c48db9788862d0290831d081bc3c64e13b592f
+refs/heads/master: 3bcac0263f0b45e67a64034ebcb69eb9abb742f4
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 1d19c025f9d2..d3b787c7aef3 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1875,6 +1875,7 @@ extern void sched_dead(struct task_struct *p);
 
 extern void proc_caches_init(void);
 extern void flush_signals(struct task_struct *);
+extern void __flush_signals(struct task_struct *);
 extern void ignore_signals(struct task_struct *);
 extern void flush_signal_handlers(struct task_struct *, int force_default);
 extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 1c8814481a11..f93efec14ff5 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -238,14 +238,19 @@ void flush_sigqueue(struct sigpending *queue)
 /*
  * Flush all pending signals for a task.
  */
+void __flush_signals(struct task_struct *t)
+{
+	clear_tsk_thread_flag(t, TIF_SIGPENDING);
+	flush_sigqueue(&t->pending);
+	flush_sigqueue(&t->signal->shared_pending);
+}
+
 void flush_signals(struct task_struct *t)
 {
 	unsigned long flags;
 
 	spin_lock_irqsave(&t->sighand->siglock, flags);
-	clear_tsk_thread_flag(t, TIF_SIGPENDING);
-	flush_sigqueue(&t->pending);
-	flush_sigqueue(&t->signal->shared_pending);
+	__flush_signals(t);
 	spin_unlock_irqrestore(&t->sighand->siglock, flags);
 }
 
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index dd19ba81201f..5a345115036c 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -2394,11 +2394,12 @@ static void selinux_bprm_committed_creds(struct linux_binprm *bprm)
 		memset(&itimer, 0, sizeof itimer);
 		for (i = 0; i < 3; i++)
 			do_setitimer(i, &itimer, NULL);
-		flush_signals(current);
 		spin_lock_irq(&current->sighand->siglock);
-		flush_signal_handlers(current, 1);
-		sigemptyset(&current->blocked);
-		recalc_sigpending();
+		if (!(current->signal->flags & SIGNAL_GROUP_EXIT)) {
+			__flush_signals(current);
+			flush_signal_handlers(current, 1);
+			sigemptyset(&current->blocked);
+		}
 		spin_unlock_irq(&current->sighand->siglock);
 	}