Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7deebec2 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Alistair Delva
Browse files

UPSTREAM: lib/vdso/32: Remove inconsistent NULL pointer checks 



The 32bit variants of vdso_clock_gettime()/getres() have a NULL pointer
check for the timespec pointer. That's inconsistent vs. 64bit.

But the vdso implementation will never be consistent versus the syscall
because the only case which it can handle is NULL. Any other invalid
pointer will cause a segfault. So special casing NULL is not really useful.

Remove it along with the superflouos syscall fallback invocation as that
will return -EFAULT anyway. That also gets rid of the dubious typecast
which only works because the pointer is NULL.

Fixes: 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20190728131648.587523358@linutronix.de


(cherry picked from commit a9446a906f52292c52ecbd5be78eaa4d8395756c)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I2d4563f336f8cc6b44f1b74f92467c4c6a579710
parent 941fb316

lib/vdso/gettimeofday.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -115,9 +115,6 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res) 
	struct __kernel_timespec ts;

	struct __kernel_timespec ts;

	int ret;

	int ret;





	if (res == NULL)

		goto fallback;



	ret = __cvdso_clock_gettime(clock, &ts);

	ret = __cvdso_clock_gettime(clock, &ts);





	if (ret == 0) {

	if (ret == 0) {
@@ -126,9 +123,6 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res) 
	}

	}





	return ret;

	return ret;



fallback:

	return clock_gettime_fallback(clock, (struct __kernel_timespec *)res);

}

}





static __maybe_unused int

static __maybe_unused int
@@ -204,10 +198,8 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res) 
		goto fallback;

		goto fallback;

	}

	}





	if (res) {

	res->tv_sec = 0;

	res->tv_sec = 0;

	res->tv_nsec = ns;

	res->tv_nsec = ns;

	}





	return 0;

	return 0;
@@ -221,9 +213,6 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res) 
	struct __kernel_timespec ts;

	struct __kernel_timespec ts;

	int ret;

	int ret;





	if (res == NULL)

		goto fallback;



	ret = __cvdso_clock_getres(clock, &ts);

	ret = __cvdso_clock_getres(clock, &ts);





	if (ret == 0) {

	if (ret == 0) {
@@ -232,8 +221,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res) 
	}

	}





	return ret;

	return ret;



fallback:

	return clock_getres_fallback(clock, (struct __kernel_timespec *)res);

}

}

#endif /* VDSO_HAS_CLOCK_GETRES */
 
#endif /* VDSO_HAS_CLOCK_GETRES */