From 3dead500998b2bad2fd7c2869ae943915e4d03d2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Tue, 20 Sep 2005 07:46:34 +0000
Subject: [PATCH] [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.
---
ChangeLog | 9 +++++++++
sysdeps/unix/sysv/linux/lddlibc4.c | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 73fd7ddf0c..02be637b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
2005-09-19 Richard Henderson <rth@redhat.com>
[BZ #1358]
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;
}