diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2014-04-18 17:23:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-07 10:28:09 -0700 |
| commit | 58773757360a8e94c60ed2f04f2a12a55cb6aa51 (patch) | |
| tree | 5806a1b46299c6c8ca7f4451a321f06cde5f1be0 /kernel/timer.c | |
| parent | 1782fdcfcabe123bce44acdf662d92f3bb059df5 (diff) | |
| download | kernel-common-58773757360a8e94c60ed2f04f2a12a55cb6aa51.tar.gz kernel-common-58773757360a8e94c60ed2f04f2a12a55cb6aa51.tar.bz2 kernel-common-58773757360a8e94c60ed2f04f2a12a55cb6aa51.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index accfd241b9e5..38f0d40fca13 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -822,7 +822,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 = (1UL << bit) - 1; expires_limit = expires_limit & ~(mask); |