From: Roland McGrath Date: Tue, 20 Sep 2005 07:46:34 +0000 (+0000) Subject: [BZ #1346] X-Git-Tag: cvs/fedora-glibc-20051003T2040~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dead500998b2bad2fd7c2869ae943915e4d03d2;p=thirdparty%2Fglibc.git [BZ #1346] 2005-09-20 Roland McGrath * 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. --- diff --git a/ChangeLog b/ChangeLog index 73fd7ddf0cf..02be637b26d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-09-20 Roland McGrath + + * 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 [BZ #1358] diff --git a/sysdeps/unix/sysv/linux/lddlibc4.c b/sysdeps/unix/sysv/linux/lddlibc4.c index f7b208e7d84..7683ec2efdd 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 , 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; }