Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: gettimeofday() vDSO: fix segfault when tv == NULL

Browse Source 
According to the gettimeofday(2) manual:

       If either tv or tz is NULL, the corresponding structure is not
       set or returned.

Since it is legal to give NULL as the tv argument, the code should make
sure tv is not NULL before trying to dereference it.

This issue manifests itself on x86_64 when vdso=0 is not on the kernel
command-line and libc uses the vDSO for gettimeofday() (e.g. glibc >=
2.7).  A simple reproducer:

  #include <stdio.h>
  #include <sys/time.h>

  int main(void)
  {
      struct timezone tz;

      gettimeofday(NULL, &tz);

      return 0;
  }

See http://bugs.debian.org/466491 for more details.

[ Impact: fix gettimeofday(NULL, &tz) segfault ]

Signed-off-by: John Wright <john.wright@hp.com>
Cc: Andi Kleen <ak@suse.de>
Cc: John Wright <john.wright@hp.com>
LKML-Reference: <1241037121-14805-1-git-send-email-john.wright@hp.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
John Wright 2009-04-29 14:32:01 -06:00 committed by Ingo Molnar
parent 091438dd56
commit 2f65dd475c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/vdso/vclock_gettime.c
View File

@ -104,11 +104,13 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
{ {
long ret; long ret;
if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != if (likely(tv != NULL)) {
offsetof(struct timespec, tv_nsec) || BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
sizeof(*tv) != sizeof(struct timespec)); offsetof(struct timespec, tv_nsec) ||
do_realtime((struct timespec *)tv); sizeof(*tv) != sizeof(struct timespec));
tv->tv_usec /= 1000; do_realtime((struct timespec *)tv);
tv->tv_usec /= 1000;
}
if (unlikely(tz != NULL)) { if (unlikely(tz != NULL)) {
/* Avoid memcpy. Some old compilers fail to inline it */ /* Avoid memcpy. Some old compilers fail to inline it */
tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest;