posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated
authorLaura Abbott <labbott@redhat.com>
Tue, 17 Apr 2018 21:57:42 +0000 (14:57 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 19 Apr 2018 10:54:57 +0000 (12:54 +0200)
commitc3bca5d450b620dd3d36e14b5e1f43639fd47d6b
treed57849e0c5a1fff07dbcaa994d6aaeb80101cdc8
parente142aa09ed88be98395dde7acb96fb2263566b68
posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated

Commit a9445e47d897 ("posix-cpu-timers: Make set_process_cpu_timer()
more robust") moved the check into the 'if' statement. Unfortunately,
it did so on the right side of an && which means that it may get short
circuited and never evaluated. This is easily reproduced with:

$ cat loop.c
void main() {
  struct rlimit res;
  /* set the CPU time limit */
  getrlimit(RLIMIT_CPU,&res);
  res.rlim_cur = 2;
  res.rlim_max = 2;
  setrlimit(RLIMIT_CPU,&res);

  while (1);
}

Which will hang forever instead of being killed. Fix this by pulling the
evaluation out of the if statement but checking the return value instead.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1568337
Fixes: a9445e47d897 ("posix-cpu-timers: Make set_process_cpu_timer() more robust")
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Cc: "Max R . P . Grossmann" <m@max.pm>
Cc: John Stultz <john.stultz@linaro.org>
Link: https://lkml.kernel.org/r/20180417215742.2521-1-labbott@redhat.com
kernel/time/posix-cpu-timers.c