Commit 4f2c5aef authored Jun 16, 2020 by Chiawei Wang Committed by Alistair Delva Jun 30, 2020

ANDROID: lib/vdso: do not update timespec if clock_getres() fails



In __cvdso_clock_getres_time32(), when clock_getres_fallback()
fails, it's not required to update the struct timespec res.

Signed-off-by: Chiawei Wang <chiaweiwang@google.com>
Reviewed-by: Mark Salyzyn <salyzyn@google.com>
Bug: 159086668
Bug: 154668398
Test: run cts -m CtsBionicTestCases -t time#clock_getres_unknown
Change-Id: Ibb7279d4520658d5c8be76e721249d3c62267d9f

parent 4da740c1

lib/vdso/gettimeofday.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -232,8 +232,11 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
		if (unlikely(ret))
		return clock_getres32_fallback(clock, res);
		#else
		if (unlikely(ret))
		if (unlikely(ret)) {
		ret = clock_getres_fallback(clock, &ts);
		if (unlikely(ret))
		return ret;
		}
		#endif

		if (likely(res)) {