TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

timekeeping: fix 32-bit overflow in get_monotonic_boottime

Browse Source 
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.

Change-Id: Ic996d8b6fbef0b72f2d027b0d8ef5259b5c1a540
Signed-off-by: Colin Cross <ccross@android.com>
This commit is contained in:
Colin Cross
2012-09-26 14:21:22 -07:00
committed by Iliyan Malchev
parent 9a4c94f973
commit ff3cd2a014
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/timekeeping.c
View File

@@ -1140,7 +1140,7 @@ void get_monotonic_boottime(struct timespec *ts)
} while (read_seqretry(&timekeeper.lock, seq)); } while (read_seqretry(&timekeeper.lock, seq));
set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec + sleep.tv_sec, set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec + sleep.tv_sec,
ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec + nsecs); (s64)ts->tv_nsec + tomono.tv_nsec + sleep.tv_nsec + nsecs);
} }
EXPORT_SYMBOL_GPL(get_monotonic_boottime); EXPORT_SYMBOL_GPL(get_monotonic_boottime);