linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Marc Zyngier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:timers/core] hrtimer: Catch illegal clockids
Date: Wed, 27 Jan 2016 03:43:19 -0800	[thread overview]
Message-ID: <tip-9006a01829a50cfd6bbd4980910ed46e895e93d7@git.kernel.org> (raw)
In-Reply-To: <1452879670-16133-3-git-send-email-marc.zyngier@arm.com>

Commit-ID:  9006a01829a50cfd6bbd4980910ed46e895e93d7
Gitweb:     http://git.kernel.org/tip/9006a01829a50cfd6bbd4980910ed46e895e93d7
Author:     Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Fri, 15 Jan 2016 17:41:09 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <marc.zyngier@arm.com>
Cc: Tomasz Nowicki <tn@semihalf.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Link: http://lkml.kernel.org/r/1452879670-16133-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 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;
 }
 
 /*

  reply	other threads:[~2016-01-27 11:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-15 17:41 [PATCH 0/3] Enabling htimer support for CLOCK_MONOTONIC_RAW Marc Zyngier
2016-01-15 17:41 ` [PATCH 1/3] hrtimer: Add " Marc Zyngier
2016-01-27 11:42   ` [tip:timers/core] " tip-bot for Marc Zyngier
2016-03-02 11:30     ` Marc Zyngier
2016-03-03 10:27       ` [tip:timers/core] hrtimer: Revert CLOCK_MONOTONIC_RAW support tip-bot for Thomas Gleixner
2016-01-15 17:41 ` [PATCH 2/3] hrtimer: Catch illegal clockids Marc Zyngier
2016-01-27 11:43   ` tip-bot for Marc Zyngier [this message]
2017-02-18 10:01   ` [tip:timers/core] hrtimer: Catch invalid clockids again tip-bot for Marc Zyngier
2016-01-15 17:41 ` [PATCH 3/3] KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW Marc Zyngier
2016-01-27 11:43   ` [tip:timers/core] " tip-bot for Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-9006a01829a50cfd6bbd4980910ed46e895e93d7@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=christoffer.dall@linaro.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tn@semihalf.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).