3.12.54-rt74-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Sebastian Andrzej Siewior <bige...@linutronix.de>

In the non-RT case the spin_lock_irq() here disables interrupts as well
as raw_spin_lock_irq(). So in the unlock case the interrupts are enabled
too early.

Reported-by: kernel test robot <ying.hu...@linux.intel.com>
Cc: stable...@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
 kernel/ptrace.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index c8cd8ffab511..fe11653fb005 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -135,12 +135,14 @@ static bool ptrace_freeze_traced(struct task_struct *task)
 
        spin_lock_irq(&task->sighand->siglock);
        if (task_is_traced(task) && !__fatal_signal_pending(task)) {
-               raw_spin_lock_irq(&task->pi_lock);
+               unsigned long flags;
+
+               raw_spin_lock_irqsave(&task->pi_lock, flags);
                if (task->state & __TASK_TRACED)
                        task->state = __TASK_TRACED;
                else
                        task->saved_state = __TASK_TRACED;
-               raw_spin_unlock_irq(&task->pi_lock);
+               raw_spin_unlock_irqrestore(&task->pi_lock, flags);
                ret = true;
        }
        spin_unlock_irq(&task->sighand->siglock);
-- 
2.7.0


Reply via email to