---

yaml --- r: 57855 b: refs/heads/master c: caec4e8 h: refs/heads/master i: 57853: b01e9a5 57851: 4a845bd 57847: dff84d6 57839: 58638fa 57823: 3b4a449 57791: c88d7bd 57727: c06840c 57599: 366f590 57343: f802f7a v: v3
git-mirror · Jun 18, 2007 · 67805f9 · 67805f9
1 parent f29c79a
commit 67805f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd197234b0a616c8f04f6b682326a5a24b33ca92
+refs/heads/master: caec4e8dc85e0644ec24aeb36285e1ba02da58cc
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -363,7 +363,13 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
  */
 int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
 {
-	int signr = __dequeue_signal(&tsk->pending, mask, info);
+	int signr = 0;
+
+	/* We only dequeue private signals from ourselves, we don't let
+	 * signalfd steal them
+	 */
+	if (tsk == current)
+		signr = __dequeue_signal(&tsk->pending, mask, info);
 	if (!signr) {
 		signr = __dequeue_signal(&tsk->signal->shared_pending,
 					 mask, info);