Update.

	* sysdeps/unix/sysv/linux/syscalls.list: Remove mmap64 alias for mmap.
	* sysdeps/unix/sysv/linux/mmap64.c: Test whether mapped area is in
	range of mmap.  If not fail.
	Patches by Daniel Jacobowitz <dan@debian.org>.

diff --git a/ChangeLog b/ChangeLog
index f4dce34..5870509 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-07-09  Ulrich Drepper  <drepper@cygnus.com>
 
+       * sysdeps/unix/sysv/linux/syscalls.list: Remove mmap64 alias for mmap.
+       * sysdeps/unix/sysv/linux/mmap64.c: Test whether mapped area is in
+       range of mmap.  If not fail.
+       Patches by Daniel Jacobowitz <dan@debian.org>.
+
        * elf/rtld.c: Split _dl_start in two pieces to prevent GOT usage
        before the relocation happened.
        Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.

diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index fc7e416..f8082ec 100644 (file)
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -1,3 +1,46 @@
-/* At least for now mmap64 is the same as mmap on all platforms.
-   When/If the 32 bit platforms get a >32 bit VFS we'll have to
-   change it for these platforms.  */
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Daniel Jacobowitz <dan@debian.org>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+#include <sys/mman.h>
+
+__ptr_t
+__mmap64 (addr, len, prot, flags, fd, offset)
+     __ptr_t addr;
+     size_t len;
+     int prot;
+     int flags;
+     int fd;
+     off64_t offset;
+{
+  if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len))
+    {
+      __set_errno (EINVAL);
+      return MAP_FAILED;
+    }
+
+  return __mmap (addr, len, prot, flags, fd, (off_t) offset);
+}
+
+weak_alias (__mmap64, mmap64)

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 3ced596..9cec3e3 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -23,7 +23,7 @@ klogctl               EXTRA   syslog          3       klogctl
 lchown         -       lchown          3       __lchown        lchown
 mlock          EXTRA   mlock           2       __mlock mlock
 mlockall       EXTRA   mlockall        1       __mlockall      mlockall
-mmap           -       mmap            6       __mmap          mmap mmap64
+mmap           -       mmap            6       __mmap          mmap
 mount          EXTRA   mount           5       __mount mount
 mremap         EXTRA   mremap          4       __mremap        mremap
 munlock                EXTRA   munlock         2       __munlock       munlock