From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbcA0Lni (ORCPT ); Wed, 27 Jan 2016 06:43:38 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34301 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043AbcA0Lne (ORCPT ); Wed, 27 Jan 2016 06:43:34 -0500 Date: Wed, 27 Jan 2016 03:43:19 -0800 From: tip-bot for Marc Zyngier Message-ID: Cc: marc.zyngier@arm.com, christoffer.dall@linaro.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tn@semihalf.com, tglx@linutronix.de, mingo@kernel.org Reply-To: marc.zyngier@arm.com, hpa@zytor.com, christoffer.dall@linaro.org, tn@semihalf.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <1452879670-16133-3-git-send-email-marc.zyngier@arm.com> References: <1452879670-16133-3-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Catch illegal clockids Git-Commit-ID: 9006a01829a50cfd6bbd4980910ed46e895e93d7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9006a01829a50cfd6bbd4980910ed46e895e93d7 Gitweb: http://git.kernel.org/tip/9006a01829a50cfd6bbd4980910ed46e895e93d7 Author: Marc Zyngier AuthorDate: Fri, 15 Jan 2016 17:41:09 +0000 Committer: Thomas Gleixner CommitDate: Wed, 27 Jan 2016 12:38:04 +0100 hrtimer: Catch illegal clockids It is way too easy to take any random clockid and feed it to the hrtimer subsystem. At best, it gets mapped to a monotonic base, but it would be better to just catch illegal values as early as possible. This patch does exactly that, mapping illegal clockids to an illegal base index, and panicing when we detect the illegal condition. Signed-off-by: Marc Zyngier Cc: Tomasz Nowicki Cc: Christoffer Dall Link: http://lkml.kernel.org/r/1452879670-16133-3-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- kernel/time/hrtimer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index a125f22..cb0fe70 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -99,6 +99,9 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) = }; static const int hrtimer_clock_to_base_table[MAX_CLOCKS] = { + /* Make sure we catch unsupported clockids */ + [0 ... MAX_CLOCKS - 1] = HRTIMER_MAX_CLOCK_BASES, + [CLOCK_REALTIME] = HRTIMER_BASE_REALTIME, [CLOCK_MONOTONIC] = HRTIMER_BASE_MONOTONIC, [CLOCK_MONOTONIC_RAW] = HRTIMER_BASE_MONOTONIC_RAW, @@ -108,7 +111,9 @@ static const int hrtimer_clock_to_base_table[MAX_CLOCKS] = { static inline int hrtimer_clockid_to_base(clockid_t clock_id) { - return hrtimer_clock_to_base_table[clock_id]; + int base = hrtimer_clock_to_base_table[clock_id]; + BUG_ON(base == HRTIMER_MAX_CLOCK_BASES); + return base; } /*