about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/lddlibc4.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-09-20 07:46:34 +0000
committerRoland McGrath <roland@gnu.org>2005-09-20 07:46:34 +0000
commit3dead500998b2bad2fd7c2869ae943915e4d03d2 (patch)
tree4e79c9fe785e3ffbbcb33acf02124c077fbecb82 /sysdeps/unix/sysv/linux/lddlibc4.c
parente751d28209b03fdb44e3ddc2f4e7defab256770d (diff)
downloadglibc-3dead500998b2bad2fd7c2869ae943915e4d03d2.tar.gz
glibc-3dead500998b2bad2fd7c2869ae943915e4d03d2.tar.xz
glibc-3dead500998b2bad2fd7c2869ae943915e4d03d2.zip
[BZ #1346]
2005-09-20  Roland McGrath  <roland@redhat.com>
	* sysdeps/unix/sysv/linux/lddlibc4.c (main): Use execv, not execl.

	[BZ #1346]
	* elf/dl-load.c (_dl_map_object_from_fd) [HAVE_Z_RELRO]: Do relro
	magic on __stack_prot only if [SHARED].  Skip mprotect if __stack_prot
	lies outside the page-rounded-down relro region.
Diffstat (limited to 'sysdeps/unix/sysv/linux/lddlibc4.c')
-rw-r--r--sysdeps/unix/sysv/linux/lddlibc4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/lddlibc4.c b/sysdeps/unix/sysv/linux/lddlibc4.c
index f7b208e7d8..7683ec2efd 100644
--- a/sysdeps/unix/sysv/linux/lddlibc4.c
+++ b/sysdeps/unix/sysv/linux/lddlibc4.c
@@ -1,5 +1,5 @@
 /* Stub for ldd script to print Linux libc4 dependencies.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -84,5 +84,5 @@ main (int argc, char *argv[])
   putenv (buf);
 
   /* Now we can execute the binary.  */
-  return execl (filename, NULL) ? 4 : 0;
+  return execv (filename, &argv[argc]) ? 4 : 0;
 }