From 0595c98494c25f8eaa1a3298e8fa032ad5e4405e Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 17 Jun 2015 20:20:08 +0000
Subject: Fix mq_notify socket, recv namespace (bug 18546).

mq_notify (in the 1996 edition of POSIX) brings in references to recv
and socket (not in POSIX until the 2001 edition).  This patch fixes
this by using __recv and __socket, exporting them from libc at version
GLIBC_PRIVATE.

Tested for x86_64 and x86 (testsuite and comparison of installed
stripped shared libraries; PLT / dynamic symbol table changes render
the comparison not particularly useful for libc).

	[BZ #18546]
	* socket/recv.c (__recv): Use libc_hidden_def.
	* socket/socket.c (__socket): Likewise.
	* sysdeps/mach/hurd/recv.c (__recv): Likewise.
	* sysdeps/mach/hurd/socket.c (__socket): Likewise.
	* sysdeps/unix/sysv/linux/generic/recv.c (__recv): Likewise.
	* sysdeps/unix/sysv/linux/recv.c (__recv): Use libc_hidden_weak.
	* sysdeps/unix/sysv/linux/socket.c (__socket): Use
	libc_hidden_def.
	* sysdeps/unix/sysv/linux/x86_64/recv.c (__recv): Use
	libc_hidden_weak.
	* include/sys/socket.h (__socket): Do not use attribute_hidden.
	Use libc_hidden_proto.
	(__recv): Likewise.
	* socket/Versions (libc): Export __recv and __socket at version
	GLIBC_PRIVATE.
	* sysdeps/unix/sysv/linux/mq_notify.c (helper_thread): Call __recv
	instead of recv.
	(init_mq_netlink): Call __socket instead of socket.
	* conform/Makefile (test-xfail-POSIX/mqueue.h/linknamespace):
	Remove variable.
---
 sysdeps/mach/hurd/recv.c               | 1 +
 sysdeps/mach/hurd/socket.c             | 1 +
 sysdeps/unix/sysv/linux/generic/recv.c | 1 +
 sysdeps/unix/sysv/linux/mq_notify.c    | 6 +++---
 sysdeps/unix/sysv/linux/recv.c         | 1 +
 sysdeps/unix/sysv/linux/socket.c       | 1 +
 sysdeps/unix/sysv/linux/x86_64/recv.c  | 1 +
 7 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c
index 4d10106d5a..358380e7a6 100644
--- a/sysdeps/mach/hurd/recv.c
+++ b/sysdeps/mach/hurd/recv.c
@@ -60,4 +60,5 @@ __recv (fd, buf, n, flags)
 
   return nread;
 }
+libc_hidden_def (__recv)
 weak_alias (__recv, recv)
diff --git a/sysdeps/mach/hurd/socket.c b/sysdeps/mach/hurd/socket.c
index f1f33db21f..bb7daddb5e 100644
--- a/sysdeps/mach/hurd/socket.c
+++ b/sysdeps/mach/hurd/socket.c
@@ -64,4 +64,5 @@ __socket (domain, type, protocol)
   return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1);
 }
 
+libc_hidden_def (__socket)
 weak_alias (__socket, socket)
diff --git a/sysdeps/unix/sysv/linux/generic/recv.c b/sysdeps/unix/sysv/linux/generic/recv.c
index 37861721e7..324cca6713 100644
--- a/sysdeps/unix/sysv/linux/generic/recv.c
+++ b/sysdeps/unix/sysv/linux/generic/recv.c
@@ -28,4 +28,5 @@ __libc_recv (int sockfd, void *buffer, size_t len, int flags)
 			 NULL, NULL);
 }
 strong_alias (__libc_recv, __recv)
+libc_hidden_def (__recv)
 weak_alias (__libc_recv, recv)
diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
index 5a27274a3d..84b9cfa839 100644
--- a/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/sysdeps/unix/sysv/linux/mq_notify.c
@@ -117,8 +117,8 @@ helper_thread (void *arg)
     {
       union notify_data data;
 
-      ssize_t n = recv (netlink_socket, &data, sizeof (data),
-			MSG_NOSIGNAL | MSG_WAITALL);
+      ssize_t n = __recv (netlink_socket, &data, sizeof (data),
+			  MSG_NOSIGNAL | MSG_WAITALL);
       if (n < NOTIFY_COOKIE_LEN)
 	continue;
 
@@ -157,7 +157,7 @@ init_mq_netlink (void)
   if (netlink_socket == -1)
     {
       /* Just a normal netlink socket, not bound.  */
-      netlink_socket = socket (AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, 0);
+      netlink_socket = __socket (AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, 0);
       /* No need to do more if we have no socket.  */
       if (netlink_socket == -1)
 	return;
diff --git a/sysdeps/unix/sysv/linux/recv.c b/sysdeps/unix/sysv/linux/recv.c
index d2e80d5a80..cd2bc1e101 100644
--- a/sysdeps/unix/sysv/linux/recv.c
+++ b/sysdeps/unix/sysv/linux/recv.c
@@ -29,3 +29,4 @@ __libc_recv (int fd, void *buf, size_t len, int flags)
 }
 weak_alias (__libc_recv, recv)
 weak_alias (__libc_recv, __recv)
+libc_hidden_weak (__recv)
diff --git a/sysdeps/unix/sysv/linux/socket.c b/sysdeps/unix/sysv/linux/socket.c
index fcb4775c6b..3b2c7fea26 100644
--- a/sysdeps/unix/sysv/linux/socket.c
+++ b/sysdeps/unix/sysv/linux/socket.c
@@ -26,4 +26,5 @@ __socket (int fd, int type, int domain)
 {
   return SOCKETCALL (socket, fd, type, domain);
 }
+libc_hidden_def (__socket)
 weak_alias (__socket, socket)
diff --git a/sysdeps/unix/sysv/linux/x86_64/recv.c b/sysdeps/unix/sysv/linux/x86_64/recv.c
index 995d11d3f0..06fdb7a5e6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/recv.c
+++ b/sysdeps/unix/sysv/linux/x86_64/recv.c
@@ -29,4 +29,5 @@ __libc_recv (int fd, void *buf, size_t n, int flags)
 }
 
 weak_alias (__libc_recv, __recv)
+libc_hidden_weak (__recv)
 weak_alias (__recv, recv)
-- 
cgit v1.2.1