diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:20:08 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:20:08 +0000 |
| commit | 0595c98494c25f8eaa1a3298e8fa032ad5e4405e (patch) | |
| tree | a3e0a10935b919b816c2f9033226b4a62dd415f2 /include/sys/socket.h | |
| parent | dfa2d21450f44b3ea7129858764c1508d87ae27a (diff) | |
| download | glibc-0595c98494c25f8eaa1a3298e8fa032ad5e4405e.tar.gz glibc-0595c98494c25f8eaa1a3298e8fa032ad5e4405e.tar.xz glibc-0595c98494c25f8eaa1a3298e8fa032ad5e4405e.zip | |
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.
Diffstat (limited to 'include/sys/socket.h')
| -rw-r--r-- | include/sys/socket.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sys/socket.h b/include/sys/socket.h index 99f60363a1..2f4bfd3a93 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -8,7 +8,8 @@ protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically. Returns a file descriptor for the new socket, or -1 for errors. */ extern int __socket (int __domain, int __type, - int __protocol) attribute_hidden; + int __protocol); +libc_hidden_proto (__socket) /* Create two new sockets, of type TYPE in domain DOMAIN and using protocol PROTOCOL, which are connected to each other, and put file @@ -64,8 +65,8 @@ libc_hidden_proto (__connect) This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t __recv (int __fd, void *__buf, size_t __n, int __flags) - attribute_hidden; +extern ssize_t __recv (int __fd, void *__buf, size_t __n, int __flags); +libc_hidden_proto (__recv) /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ |