From: Greg Hackmann <ghackmann@google.com>
To: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Ben Fennema <fennema@google.com>,
linux-kernel@vger.kernel.org,
Greg Hackmann <ghackmann@google.com>,
stable@vger.kernel.org
Subject: [PATCH] alarmtimer: don't rate limit one-shot timers
Date: Tue, 25 Jul 2017 12:42:46 -0700 [thread overview]
Message-ID: <20170725194246.78059-1-ghackmann@google.com> (raw)
In-Reply-To: <20170725180148.GA24730@kroah.com>
Commit ff86bf0c65f1 ("alarmtimer: Rate limit periodic intervals") sets a
minimum bound on the alarm timer interval. This minimum bound shouldn't
be applied if the interval is 0. Otherwise, one-shot timers will be
converted into periodic ones.
This patch is specific to 4.11.y and 4.12.y. Older -stable trees have a
slightly different patch, and 4.13-rc2 isn't impacted due to a later
refactoring.
Fixes: ff86bf0c65f1 ("alarmtimer: Rate limit periodic intervals")
Reported-by: Ben Fennema <fennema@google.com>
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Cc: stable@vger.kernel.org
---
kernel/time/alarmtimer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index ee2f4202d82a..11e70a38497c 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -665,7 +665,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
* Rate limit to the tick as a hot fix to prevent DOS. Will be
* mopped up later.
*/
- if (timr->it.alarm.interval < TICK_NSEC)
+ if (timr->it.alarm.interval && timr->it.alarm.interval < TICK_NSEC)
timr->it.alarm.interval = TICK_NSEC;
exp = timespec64_to_ktime(new_setting->it_value);
--
2.14.0.rc0.284.gd933b75aa4-goog
next prev parent reply other threads:[~2017-07-25 19:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 17:19 [PATCH] alarmtimer: don't rate limit one-shot timers Greg Hackmann
2017-07-24 18:21 ` Greg KH
2017-07-24 21:41 ` Greg Hackmann
2017-07-24 21:55 ` Greg KH
2017-07-25 7:00 ` Thomas Gleixner
2017-07-25 18:01 ` Greg KH
2017-07-25 19:42 ` Greg Hackmann [this message]
2017-07-25 21:43 ` Patch "alarmtimer: don't rate limit one-shot timers" has been added to the 4.12-stable tree gregkh
2017-07-25 21:43 ` [PATCH] alarmtimer: don't rate limit one-shot timers Greg KH
2017-07-25 18:05 ` Patch "alarmtimer: don't rate limit one-shot timers" has been added to the 3.18-stable tree gregkh
2017-07-25 18:05 ` Patch "alarmtimer: don't rate limit one-shot timers" has been added to the 4.4-stable tree gregkh
2017-07-25 18:05 ` Patch "alarmtimer: don't rate limit one-shot timers" has been added to the 4.9-stable tree gregkh
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=20170725194246.78059-1-ghackmann@google.com \
--to=ghackmann@google.com \
--cc=fennema@google.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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).