timer: Prevent overflow in apply_slack
authorJiri Bohac <jbohac@suse.cz>
Fri, 18 Apr 2014 15:23:11 +0000 (17:23 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 9 Jun 2014 12:29:04 +0000 (13:29 +0100)
commit45abc77821b67dfef4288606ef6992882b12957e
tree2a405e7b1543b0c0df32b14e0178c19ad230a861
parentdcb3bbe52762c722e92aca9ac20ba9ce792c46e0
timer: Prevent overflow in apply_slack

commit 98a01e779f3c66b0b11cd7e64d531c0e41c95762 upstream.

On architectures with sizeof(int) < sizeof (long), the
computation of mask inside apply_slack() can be undefined if the
computed bit is > 32.

E.g. with: expires = 0xffffe6f5 and slack = 25, we get:

expires_limit = 0x20000000e
bit = 33
mask = (1 << 33) - 1  /* undefined */

On x86, mask becomes 1 and and the slack is not applied properly.
On s390, mask is -1, expires is set to 0 and the timer fires immediately.

Use 1UL << bit to solve that issue.

Suggested-by: Deborah Townsend <dstownse@us.ibm.com>
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Link: http://lkml.kernel.org/r/20140418152310.GA13654@midget.suse.cz
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
kernel/timer.c