[v2,4/8] lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK
diff mbox series

Message ID 20190830135902.20861-5-vincenzo.frascino@arm.com
State New
Headers show
  • vdso: Complete the conversion to 32bit syscalls
Related show

Commit Message

Vincenzo Frascino Aug. 30, 2019, 1:58 p.m. UTC
VDSO_HAS_32BIT_FALLBACK was introduced to address a regression which
caused seccomp to deny access to the applications to clock_gettime64()
and clock_getres64() because they are not enabled in the existing

The purpose of VDSO_HAS_32BIT_FALLBACK was to simplify the conditional
implementation of __cvdso_clock_get*time32() variants.

Now that all the architectures that support the generic vDSO library
have been converted to support the 32 bit fallbacks the conditional
can be removed.

Cc: Thomas Gleixner <tglx@linutronix.de>
CC: Andy Lutomirski <luto@kernel.org>
References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
 lib/vdso/gettimeofday.c | 10 ----------
 1 file changed, 10 deletions(-)

diff mbox series

diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index a86e89e6dedc..2c4b311c226d 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -126,13 +126,8 @@  __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	ret = __cvdso_clock_gettime_common(clock, &ts);
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
-	if (unlikely(ret))
-		ret = clock_gettime_fallback(clock, &ts);
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;
@@ -240,13 +235,8 @@  __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	ret = __cvdso_clock_getres_common(clock, &ts);
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
-	if (unlikely(ret))
-		ret = clock_getres_fallback(clock, &ts);
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;