AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-11 22:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

timex: Use 64-bit fields on 32-bit TIMESIZE=64 systems (BZ #28469)

Browse Source 
This was found when testing the OpenRISC port I am working on.  These
two tests fail with SIGSEGV:

  FAIL: misc/tst-ntp_gettime
  FAIL: misc/tst-ntp_gettimex

This was found to be due to the kernel overwriting the stack space
allocated by the timex structure.  The reason for the overwrite being
that the kernel timex has 64-bit fields and user space code only
allocates enough stack space for timex with 32-bit fields.

On 32-bit systems with TIMESIZE=64 __USE_TIME_BITS64 is not defined.
This causes the timex structure to use 32-bit fields with type
__syscall_slong_t.

This patch adjusts the ifdef condition to allow 32-bit systems with
TIMESIZE=64 to use the 64-bit long long timex definition.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

(Cherry picked from commit 1d550265a7)
This commit is contained in:
Stafford Horne 2021-10-15 06:17:41 +09:00 committed by Adhemerval Zanella
parent 76843f3b3e
commit cb9b8b5d76
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysdeps/unix/sysv/linux/bits/timex.h
View File

@ -25,7 +25,7 @@
struct timex struct timex
{ {
# ifdef __USE_TIME_BITS64 # if defined __USE_TIME_BITS64 || (__TIMESIZE == 64 && __WORDSIZE == 32)
unsigned int modes; /* mode selector */ unsigned int modes; /* mode selector */
int :32; /* pad */ int :32; /* pad */
long long offset; /* time offset (usec) */ long long offset; /* time offset (usec) */