[PATCH 4/7] lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK

From: Vincenzo Frascino
Date: Thu Aug 29 2019 - 07:20:21 EST

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@xxxxxxxxxxxxx>
CC: Andy Lutomirski <luto@xxxxxxxxxx>
References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
lib/vdso/gettimeofday.c | 10 ----------
1 file changed, 10 deletions(-)

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;