From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754068AbdGYTnI (ORCPT ); Tue, 25 Jul 2017 15:43:08 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:34823 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbdGYTnG (ORCPT ); Tue, 25 Jul 2017 15:43:06 -0400 From: Greg Hackmann To: John Stultz , Thomas Gleixner Cc: Ben Fennema , linux-kernel@vger.kernel.org, Greg Hackmann , stable@vger.kernel.org Subject: [PATCH] alarmtimer: don't rate limit one-shot timers Date: Tue, 25 Jul 2017 12:42:46 -0700 Message-Id: <20170725194246.78059-1-ghackmann@google.com> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog In-Reply-To: <20170725180148.GA24730@kroah.com> References: <20170725180148.GA24730@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Greg Hackmann 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