3.4.94-rt117-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <b...@decadent.org.uk>
In an rt-kernel with CONFIG_MISSED_TIMER_OFFSETS_HIST enabled,
__hrtimer_start_range_ns() now crashes, as new_base is not assigned
before it is used.
Tested-by: Carsten Emde <c.e...@osadl.org>
Cc: stable...@vger.kernel.org
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
kernel/hrtimer.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b62a3a7541c7..3f7d3b5b0717 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1038,6 +1038,11 @@ int __hrtimer_start_range_ns(struct hrtimer *timer,
ktime_t tim,
#endif
}
+ hrtimer_set_expires_range_ns(timer, tim, delta_ns);
+
+ /* Switch the timer base, if necessary: */
+ new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
+
#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
{
ktime_t now = new_base->get_time();
@@ -1049,11 +1054,6 @@ int __hrtimer_start_range_ns(struct hrtimer *timer,
ktime_t tim,
}
#endif
- hrtimer_set_expires_range_ns(timer, tim, delta_ns);
-
- /* Switch the timer base, if necessary: */
- new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
-
timer_stats_hrtimer_set_start_info(timer);
leftmost = enqueue_hrtimer(timer, new_base);
--
2.0.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
