45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From cd3d3f85e82d6ce73b27aee9a55556bed8003e2d Mon Sep 17 00:00:00 2001
|
|
Message-Id: <cd3d3f85e82d6ce73b27aee9a55556bed8003e2d.1596234184.git.zanussi@kernel.org>
|
|
In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 16 Sep 2019 12:33:59 +0200
|
|
Subject: [PATCH 297/329] posix-timers: Unlock expiry lock in the early return
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz
|
|
|
|
[ Upstream commit 356a2781375ec58521a9bc3f500488745990c242 ]
|
|
|
|
Patch ("posix-timers: Add expiry lock") acquired a lock in
|
|
run_posix_cpu_timers() but didn't drop the lock in the early return.
|
|
|
|
Unlock the lock in the early return path.
|
|
|
|
Reported-by: kbuild test robot <lkp@intel.com>
|
|
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
|
---
|
|
kernel/time/posix-cpu-timers.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
|
|
index 765e700962ab..c9964dc3276b 100644
|
|
--- a/kernel/time/posix-cpu-timers.c
|
|
+++ b/kernel/time/posix-cpu-timers.c
|
|
@@ -1175,8 +1175,10 @@ static void __run_posix_cpu_timers(struct task_struct *tsk)
|
|
expiry_lock = this_cpu_ptr(&cpu_timer_expiry_lock);
|
|
spin_lock(expiry_lock);
|
|
|
|
- if (!lock_task_sighand(tsk, &flags))
|
|
+ if (!lock_task_sighand(tsk, &flags)) {
|
|
+ spin_unlock(expiry_lock);
|
|
return;
|
|
+ }
|
|
/*
|
|
* Here we take off tsk->signal->cpu_timers[N] and
|
|
* tsk->cpu_timers[N] all the timers that are firing, and
|
|
--
|
|
2.17.1
|
|
|