Fix posix_spawn getrlimit64 namespace (bug 17991).

posix_spawn (a standard POSIX function) brings in a use of getrlimit64
(not a standard POSIX function).  This patch fixes this by using
__getrlimit64 and making getrlimit64 a weak alias.

This is more complicated than some such changes because of files that
define getrlimit64 in their own way using symbol versioning after
including the main sysdeps/unix/sysv/linux/getrlimit64.c with a
getrlimit macro defined.  There are various existing patterns for such
cases in glibc; the one I've used here is that a getrlimit64 macro
disables the weak_alias / libc_hidden_weak calls, leaving it to the
including file to define the getrlimit64 name in whatever way is
appropriate.

Tested for x86_64 and x86 that installed stripped shared libraries are
unchanged by this patch.

	[BZ #17991]
	* include/sys/resource.h (__getrlimit64): Declare.  Use
	libc_hidden_proto.
	* resource/getrlimit64.c (getrlimit64): Rename to __getrlimit64
	and define as weak alias of __getrlimit64.  Use libc_hidden_weak.
	* sysdeps/posix/spawni.c (__spawni): Call __getrlimit64 instead of
	getrlimit64.
	* sysdeps/unix/sysv/linux/getrlimit64.c (getrlimit64): Rename to
	__getrlimit64.
	[!getrlimit64] (getrlimit64): Define as weak alias of
	__getrlimit64.  Use libc_hidden_weak.
	* sysdeps/unix/sysv/linux/i386/getrlimit64.c (getrlimit64): Define
	using __getrlimit64 not __new_getrlimit64.
	(__GI_getrlimit64): Likewise.
	* sysdeps/unix/sysv/linux/mips/getrlimit64.c (getrlimit64):
	Likewise.
	(__GI_getrlimit64): Likewise.
	(__old_getrlimit64): Use __getrlimit64 not __new_getrlimit64.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
	(getrlimit): Add __getrlimit64 alias.
	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (getrlimit):
	Likewise.
	* conform/Makefile (test-xfail-XOPEN2K/spawn.h/linknamespace):
	Remove variable.
	(test-xfail-POSIX2008/spawn.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/spawn.h/linknamespace): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ee0a822daf05d81b89c06dd0daa9d7d336e4c6da..068ed1baf76d6a9b4b0bda54a74bd2ecf33594a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2015-02-17  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #17991]
+       * include/sys/resource.h (__getrlimit64): Declare.  Use
+       libc_hidden_proto.
+       * resource/getrlimit64.c (getrlimit64): Rename to __getrlimit64
+       and define as weak alias of __getrlimit64.  Use libc_hidden_weak.
+       * sysdeps/posix/spawni.c (__spawni): Call __getrlimit64 instead of
+       getrlimit64.
+       * sysdeps/unix/sysv/linux/getrlimit64.c (getrlimit64): Rename to
+       __getrlimit64.
+       [!getrlimit64] (getrlimit64): Define as weak alias of
+       __getrlimit64.  Use libc_hidden_weak.
+       * sysdeps/unix/sysv/linux/i386/getrlimit64.c (getrlimit64): Define
+       using __getrlimit64 not __new_getrlimit64.
+       (__GI_getrlimit64): Likewise.
+       * sysdeps/unix/sysv/linux/mips/getrlimit64.c (getrlimit64):
+       Likewise.
+       (__GI_getrlimit64): Likewise.
+       (__old_getrlimit64): Use __getrlimit64 not __new_getrlimit64.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
+       (getrlimit): Add __getrlimit64 alias.
+       * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (getrlimit):
+       Likewise.
+       * conform/Makefile (test-xfail-XOPEN2K/spawn.h/linknamespace):
+       Remove variable.
+       (test-xfail-POSIX2008/spawn.h/linknamespace): Likewise.
+       (test-xfail-XOPEN2K8/spawn.h/linknamespace): Likewise.
+
 2015-02-17  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * libio/fileops.c: Add missing sys/mman.h

diff --git a/NEWS b/NEWS
index 1c5e5909c4dd1d8ab6fb704296ca883bab4f3956..29af3e9979196c50683e3b48060be1c8b3a58abc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.22
 * The following bugs are resolved with this release:
 
   4719, 15467, 15790, 16560, 17569, 17792, 17912, 17932, 17944, 17949,
-  17964, 17965, 17967, 17969, 17978, 17987.
+  17964, 17965, 17967, 17969, 17978, 17987, 17991.
 \f
 Version 2.21
 

diff --git a/conform/Makefile b/conform/Makefile
index 331590a26641d9788e5bd4725f929c079a946d83..c0c0db74a9fe73138fb27be952ee1810d1ec9982 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -391,7 +391,6 @@ test-xfail-XOPEN2K/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K/regex.h/linknamespace = yes
 test-xfail-XOPEN2K/search.h/linknamespace = yes
 test-xfail-XOPEN2K/signal.h/linknamespace = yes
-test-xfail-XOPEN2K/spawn.h/linknamespace = yes
 test-xfail-XOPEN2K/stdlib.h/linknamespace = yes
 test-xfail-XOPEN2K/sys/wait.h/linknamespace = yes
 test-xfail-XOPEN2K/syslog.h/linknamespace = yes
@@ -403,7 +402,6 @@ test-xfail-POSIX2008/grp.h/linknamespace = yes
 test-xfail-POSIX2008/netdb.h/linknamespace = yes
 test-xfail-POSIX2008/regex.h/linknamespace = yes
 test-xfail-POSIX2008/semaphore.h/linknamespace = yes
-test-xfail-POSIX2008/spawn.h/linknamespace = yes
 test-xfail-POSIX2008/unistd.h/linknamespace = yes
 test-xfail-XOPEN2K8/dirent.h/linknamespace = yes
 test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes
@@ -412,6 +410,5 @@ test-xfail-XOPEN2K8/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K8/pwd.h/linknamespace = yes
 test-xfail-XOPEN2K8/regex.h/linknamespace = yes
 test-xfail-XOPEN2K8/search.h/linknamespace = yes
-test-xfail-XOPEN2K8/spawn.h/linknamespace = yes
 test-xfail-XOPEN2K8/syslog.h/linknamespace = yes
 test-xfail-XOPEN2K8/unistd.h/linknamespace = yes

diff --git a/include/sys/resource.h b/include/sys/resource.h
index 1ce190f5f0cdb7e926cd9fcb70fab6692e099892..7622da969a6cd846f7c55b654264c106140b041d 100644 (file)
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -5,6 +5,8 @@
 libc_hidden_proto (getpriority)
 libc_hidden_proto (setpriority)
 libc_hidden_proto (getrlimit64)
+extern __typeof (getrlimit64) __getrlimit64;
+libc_hidden_proto (__getrlimit64);
 
 /* Now define the internal interfaces.  */
 extern int __getrlimit (enum __rlimit_resource __resource,

diff --git a/resource/getrlimit64.c b/resource/getrlimit64.c
index 6d22eca2b31affecd8353349687fc47c1e8a0a38..cb494cc4d12f3b0205c06521d3a8ed9081508a8b 100644 (file)
--- a/resource/getrlimit64.c
+++ b/resource/getrlimit64.c
@@ -22,7 +22,7 @@
 /* Put the soft and hard limits for RESOURCE in *RLIMITS.
    Returns 0 if successful, -1 if not (and sets errno).  */
 int
-getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
+__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
 {
   struct rlimit rlimits32;
 
@@ -40,4 +40,6 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
 
   return 0;
 }
-libc_hidden_def (getrlimit64)
+libc_hidden_def (__getrlimit64)
+weak_alias (__getrlimit64, getrlimit64)
+libc_hidden_weak (getrlimit64)

diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index 4a25c89c4be4e7e0e72f4d6bb8ab64bd02b46f02..eee9331ecff6fa9e07cbf3b26fe4ca50ec0fa684 100644 (file)
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -188,7 +188,7 @@ __spawni (pid_t *pid, const char *file,
                {
                  if (! have_fdlimit)
                    {
-                     getrlimit64 (RLIMIT_NOFILE, &fdlimit);
+                     __getrlimit64 (RLIMIT_NOFILE, &fdlimit);
                      have_fdlimit = true;
                    }
 

diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
index 461d3458dfd21cf8a2b8093bb7aae47942e1068c..100ba623e227c35e6e3f0bbf73c31eb8b970d201 100644 (file)
--- a/sysdeps/unix/sysv/linux/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/getrlimit64.c
@@ -24,7 +24,7 @@
 /* Put the soft and hard limits for RESOURCE in *RLIMITS.
    Returns 0 if successful, -1 if not (and sets errno).  */
 int
-getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
+__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
 {
 #ifdef __ASSUME_PRLIMIT64
   return INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits);
@@ -51,4 +51,8 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
   return 0;
 #endif
 }
-libc_hidden_def (getrlimit64)
+libc_hidden_def (__getrlimit64)
+#ifndef getrlimit64
+weak_alias (__getrlimit64, getrlimit64)
+libc_hidden_weak (getrlimit64)
+#endif

diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit64.c b/sysdeps/unix/sysv/linux/i386/getrlimit64.c
index a7715843997baf4c895e6c88798c4575a3b3d32f..8bd3bd9dab80497155cee6230c688717262aef4a 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/i386/getrlimit64.c
@@ -21,5 +21,5 @@
 
 #undef getrlimit64
 #include <shlib-compat.h>
-versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_2);
-strong_alias (__new_getrlimit64, __GI_getrlimit64)
+versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_2);
+strong_alias (__getrlimit64, __GI_getrlimit64)

diff --git a/sysdeps/unix/sysv/linux/mips/getrlimit64.c b/sysdeps/unix/sysv/linux/mips/getrlimit64.c
index 7080f77e8170604d56b3971a91818302dfb76eab..751b11a6318cd4a17077a3bd7252209f2bdc21a5 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/mips/getrlimit64.c
@@ -25,8 +25,8 @@
 # include <sysdeps/unix/sysv/linux/getrlimit64.c>
 # undef getrlimit64
 
-versioned_symbol (libc, __new_getrlimit64, getrlimit64, GLIBC_2_19);
-strong_alias (__new_getrlimit64, __GI_getrlimit64)
+versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_19);
+strong_alias (__getrlimit64, __GI_getrlimit64)
 
 # if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_19)
 
@@ -45,7 +45,7 @@ __old_getrlimit64 (enum __rlimit_resource resource,
 {
   struct rlimit64 krlimits;
 
-  if (__new_getrlimit64 (resource, &krlimits) < 0)
+  if (__getrlimit64 (resource, &krlimits) < 0)
     return -1;
 
   if (krlimits.rlim_cur == RLIM64_INFINITY)

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
index aee60bf9d5d9447c487e0d03940cfad2a1c5e3c9..6ba6f9b1e931b9133b222700b92be8419347e2f8 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list
@@ -1,3 +1,3 @@
 # File name    Caller  Syscall name    # args  Strong name     Weak names
 
-getrlimit      -       ugetrlimit      i:ip    __getrlimit     getrlimit getrlimit64
+getrlimit      -       ugetrlimit      i:ip    __getrlimit     getrlimit getrlimit64 __getrlimit64

diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
index 77aa246435e5307451b2664a02c95b6d0b771bfc..2876bbdc3e1cf5d0c1609f7f8d313f1cbac5eb43 100644 (file)
--- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
@@ -10,7 +10,7 @@ statfs                -       statfs          i:sp    __statfs        statfs statfs64
 mmap           -       mmap            b:aniiii __mmap         mmap __mmap64 mmap64
 ftruncate      -       ftruncate       i:ii    __ftruncate     ftruncate ftruncate64 __ftruncate64
 truncate       -       truncate        i:si    truncate        truncate64
-getrlimit      -       getrlimit       i:ip    __getrlimit     getrlimit getrlimit64
+getrlimit      -       getrlimit       i:ip    __getrlimit     getrlimit getrlimit64 __getrlimit64
 setrlimit      -       setrlimit       i:ip    __setrlimit     setrlimit setrlimit64
 readahead      -       readahead       i:iii   __readahead     readahead
 sendfile       -       sendfile        i:iipi  sendfile        sendfile64