* [PATCH] posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated
@ 2018-04-17 21:57 Laura Abbott
2018-04-19 10:58 ` [tip:timers/urgent] " tip-bot for Laura Abbott
0 siblings, 1 reply; 2+ messages in thread
From: Laura Abbott @ 2018-04-17 21:57 UTC (permalink / raw)
To: Max R . P . Grossmann, Thomas Gleixner
Cc: Laura Abbott, John Stultz, linux-kernel
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>
---
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 ec9f5da6f163..9cfa7f907654 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1187,10 +1187,12 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
u64 *newval, u64 *oldval)
{
u64 now;
+ int ret;
WARN_ON_ONCE(clock_idx == CPUCLOCK_SCHED);
+ ret = cpu_timer_sample_group(clock_idx, tsk, &now);
- if (oldval && cpu_timer_sample_group(clock_idx, tsk, &now) != -EINVAL) {
+ if (oldval && ret != -EINVAL) {
/*
* We are setting itimer. The *oldval is absolute and we update
* it to be relative, *newval argument is relative and we update
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:timers/urgent] posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated
2018-04-17 21:57 [PATCH] posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated Laura Abbott
@ 2018-04-19 10:58 ` tip-bot for Laura Abbott
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Laura Abbott @ 2018-04-19 10:58 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, labbott, m, tglx, mingo, john.stultz
Commit-ID: c3bca5d450b620dd3d36e14b5e1f43639fd47d6b
Gitweb: https://git.kernel.org/tip/c3bca5d450b620dd3d36e14b5e1f43639fd47d6b
Author: Laura Abbott <labbott@redhat.com>
AuthorDate: Tue, 17 Apr 2018 14:57:42 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 19 Apr 2018 12:54:57 +0200
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 | 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 2541bd89f20e..5a6251ac6f7a 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1205,10 +1205,12 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
u64 *newval, u64 *oldval)
{
u64 now;
+ int ret;
WARN_ON_ONCE(clock_idx == CPUCLOCK_SCHED);
+ ret = cpu_timer_sample_group(clock_idx, tsk, &now);
- if (oldval && cpu_timer_sample_group(clock_idx, tsk, &now) != -EINVAL) {
+ if (oldval && ret != -EINVAL) {
/*
* We are setting itimer. The *oldval is absolute and we update
* it to be relative, *newval argument is relative and we update
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-19 10:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-17 21:57 [PATCH] posix-cpu-timers: Ensure set_process_cpu_timer is always evaluated Laura Abbott
2018-04-19 10:58 ` [tip:timers/urgent] " tip-bot for Laura Abbott
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.