]> git.baikalelectronics.ru Git - kernel.git/commitdiff
posix-cpu-timers: Prevent spuriously armed 0-value itimer
authorFrederic Weisbecker <frederic@kernel.org>
Mon, 13 Sep 2021 14:53:32 +0000 (16:53 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 23 Sep 2021 09:53:51 +0000 (11:53 +0200)
Resetting/stopping an itimer eventually leads to it being reprogrammed
with an actual "0" value. As a result the itimer expires on the next
tick, triggering an unexpected signal.

To fix this, make sure that
struct signal_struct::it[CPUCLOCK_PROF/VIRT]::expires is set to 0 when
setitimer() passes a 0 it_value, indicating that the timer must stop.

Fixes: 1d67d6bcda20 ("posix-cpu-timers: Force next expiration recalc after itimer reset")
Reported-by: Victor Stinner <vstinner@redhat.com>
Reported-by: Chris Hixon <linux-kernel-bugs@hixontech.com>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210913145332.232023-1-frederic@kernel.org
kernel/time/posix-cpu-timers.c

index ee736861b18f7e5a30df8d259ce4bd1f9b6d50e7..643d412ac6235eae110975f60247c97a8f278225 100644 (file)
@@ -1404,7 +1404,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
                        }
                }
 
-               *newval += now;
+               if (*newval)
+                       *newval += now;
        }
 
        /*