3.4.y: timekeeping: fix 32-bit overflow in get_monotonic_boottime
authorColin Cross <ccross@android.com>
Mon, 10 Feb 2014 21:16:29 +0000 (13:16 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Feb 2014 19:51:21 +0000 (11:51 -0800)
commitcd34de10471a5ddad397739fae33555d47e53769
tree99e2e27194d72d5767093568a956751b835fdf43
parentcf85cc93b24891b7e57b1d9939742b5774570b19
3.4.y: timekeeping: fix 32-bit overflow in get_monotonic_boottime

fixed upstream in v3.6 by ec145babe754f9ea1079034a108104b6001e001c

get_monotonic_boottime adds three nanonsecond values stored
in longs, followed by an s64.  If the long values are all
close to 1e9 the first three additions can overflow and
become negative when added to the s64.  Cast the first
value to s64 so that all additions are 64 bit.

Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: Fished this out of the AOSP commong.git tree. This was
fixed upstream in v3.6 by ec145babe754f9ea1079034a108104b6001e001c]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/timekeeping.c