[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140417194215.GA10494@midget.suse.cz>
Date:	Thu, 17 Apr 2014 21:42:15 +0200
From:	Jiri Bohac <jbohac@...e.cz>
To:	Thomas Gleixner <tglx@...utronix.de>
Cc:	linux-kernel@...r.kernel.org
Subject: [PATCH] timer: prevent overflow in apply_slack
Prevent overflow in the computation of timer expiry time inside
apply_slack().
Signed-off-by: Jiri Bohac <jbohac@...e.cz>
Suggested-by: Deborah Townsend <dstownse@...ibm.com>
diff --git a/kernel/timer.c b/kernel/timer.c
index 87bd529..4c36c91 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -838,7 +838,7 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
 
 	bit = find_last_bit(&mask, BITS_PER_LONG);
 
-	mask = (1 << bit) - 1;
+	mask = (1LL << bit) - 1;
 
 	expires_limit = expires_limit & ~(mask);
 
-- 
Jiri Bohac <jbohac@...e.cz>
SUSE Labs, SUSE CZ
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
