[GIT pull] timers/urgent for v5.15-rc3
From: Thomas Gleixner
Date: Sun Sep 26 2021 - 06:34:18 EST
Linus,
please pull the latest timers/urgent branch from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2021-09-26
up to: 8cd9da85d2bd: posix-cpu-timers: Prevent spuriously armed 0-value itimer
A single fix for the recently introduced regression in posix CPU timers
which failed to stop the timer when requested. That caused unexpected
signals to be sent to the process/thread causing malfunction.
Thanks,
tglx
------------------>
Frederic Weisbecker (1):
posix-cpu-timers: Prevent spuriously armed 0-value itimer
kernel/time/posix-cpu-timers.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index ee736861b18f..643d412ac623 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1404,7 +1404,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
}
}
- *newval += now;
+ if (*newval)
+ *newval += now;
}
/*