[rt] Refresh a patch whose context was changed by the ptrace security fix
svn path=/dists/sid/linux/; revision=19829
This commit is contained in:
parent
9fd3664528
commit
35383488a7
|
@ -8,20 +8,16 @@ waking up current :)
|
|||
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
---
|
||||
kernel/signal.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/kernel/signal.c b/kernel/signal.c
|
||||
index 9b6bd34..fffb683 100644
|
||||
--- a/kernel/signal.c
|
||||
+++ b/kernel/signal.c
|
||||
@@ -682,6 +682,9 @@ void signal_wake_up(struct task_struct *t, int resume)
|
||||
|
||||
@@ -679,6 +679,10 @@ int dequeue_signal(struct task_struct *t
|
||||
void signal_wake_up_state(struct task_struct *t, unsigned int state)
|
||||
{
|
||||
set_tsk_thread_flag(t, TIF_SIGPENDING);
|
||||
|
||||
+
|
||||
+ if (unlikely(t == current))
|
||||
+ return;
|
||||
+
|
||||
/*
|
||||
* For SIGKILL, we want to wake it up in the stopped/traced/killable
|
||||
* TASK_WAKEKILL also means wake it up in the stopped/traced/killable
|
||||
* case. We don't check t->state here because there is a race with it
|
||||
|
|
Loading…
Reference in New Issue