Commit d6f99782 authored Aug 30, 2019 by Vincenzo Frascino Committed by Alistair Delva Apr 27, 2020

UPSTREAM: lib/vdso: Remove checks on return value for 32 bit vDSO



Since all the architectures that support the generic vDSO library have
been converted to support the 32 bit fallbacks it is not required
anymore to check the return value of __cvdso_clock_get*time32_common()
before updating the old_timespec fields.

Remove the related checks from the generic vdso library.

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20190830135902.20861-6-vincenzo.frascino@arm.com


(cherry picked from commit a279235ddbe975670afe2267162028ec0a312293)
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I31637fcdac30262c1837b098345a2c057794ea17

parent 0854e591

lib/vdso/gettimeofday.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -134,10 +134,10 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
		ret = clock_gettime_fallback(clock, &ts);
		#endif

		if (likely(!ret)) {
		/* For ret == 0 */
		res->tv_sec = ts.tv_sec;
		res->tv_nsec = ts.tv_nsec;
		}

		return ret;
		}
		#endif /* BUILD_VDSO32 */
		@@ -250,7 +250,7 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
		ret = clock_getres_fallback(clock, &ts);
		#endif

		if (likely(!ret && res)) {
		if (likely(res)) {
		res->tv_sec = ts.tv_sec;
		res->tv_nsec = ts.tv_nsec;
		}