]> git.baikalelectronics.ru Git - kernel.git/commit
x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>
Fri, 9 May 2014 15:11:27 +0000 (11:11 -0400)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 9 May 2014 15:45:52 +0000 (08:45 -0700)
commitdcae5ed2ce1a7f1f62591da09b0783443a83737a
tree2483505e3c98fd83565a1576af11daf629f8efdf
parent54f035b6ac69e27f998e17932cbc677d66093eba
x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()

With tk->wall_to_monotonic.tv_nsec being a 32-bit value on 32-bit
systems, (tk->wall_to_monotonic.tv_nsec << tk->shift) in update_vsyscall()
may lose upper bits or, worse, add them since compiler will do this:
(u64)(tk->wall_to_monotonic.tv_nsec << tk->shift)
instead of
((u64)tk->wall_to_monotonic.tv_nsec << tk->shift)

So if, for example, tv_nsec is 0x800000 and shift is 8 we will end up
with 0xffffffff80000000 instead of 0x80000000. And then we are stuck in
the subsequent 'while' loop.

We need an explicit cast.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: http://lkml.kernel.org/r/1399648287-15178-1-git-send-email-boris.ostrovsky@oracle.com
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: <stable@vger.kernel.org> # v3.14
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/kernel/vsyscall_gtod.c