Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UPSTREAM: lib/vdso: Make clock_getres() POSIX compliant again

Browse source 
A recent commit removed the NULL pointer check from the clock_getres()
implementation causing a test case to fault.

POSIX requires an explicit NULL pointer check for clock_getres() aside of
the validity check of the clock_id argument for obscure reasons.

Add it back for both 32bit and 64bit.

Note, this is only a partial revert of the offending commit which does not
bring back the broken fallback invocation in the the 32bit compat
implementations of clock_getres() and clock_gettime().

Fixes: a9446a906f52 ("lib/vdso/32: Remove inconsistent NULL pointer checks")
Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1910211202260.1904@nanos.tec.linutronix.de
(cherry picked from commit 1638b8f096ca165965189b9626564c933c79fe63)
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I3a157d989ec54577781742d69380261bc4279676
This commit is contained in:
Thomas Gleixner 2019-10-21 12:07:15 +02:00 committed by Alistair Delva
parent 28652a9b58
commit ca48e5d84c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/vdso/gettimeofday.c
View file

@ -214,9 +214,10 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
return -1; return -1;
} }
res->tv_sec = 0; if (likely(res)) {
res->tv_nsec = ns; res->tv_sec = 0;
res->tv_nsec = ns;
}
return 0; return 0;
} }
@ -245,7 +246,7 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
ret = clock_getres_fallback(clock, &ts); ret = clock_getres_fallback(clock, &ts);
#endif #endif
if (likely(!ret)) { if (likely(!ret && res)) {
res->tv_sec = ts.tv_sec; res->tv_sec = ts.tv_sec;
res->tv_nsec = ts.tv_nsec; res->tv_nsec = ts.tv_nsec;
} }