This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-41-ga194625
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Aug 2016 23:43:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-41-ga194625
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a194625ef31f0c33afae9b53e2dfaa17c2517606 (commit)
from bf79a337ec86c2530edd26f4270f9688bf428ea2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a194625ef31f0c33afae9b53e2dfaa17c2517606
commit a194625ef31f0c33afae9b53e2dfaa17c2517606
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Aug 9 01:42:50 2016 +0200
Fix recvmsg returning SIGLOST on PF_LOCAL sockets
when msg_name is not NULL.
* sysdeps/mach/hurd/recvmsg.c (__libc_recvmsg): Cope with aport being
MACH_PORT_NULL.
diff --git a/ChangeLog b/ChangeLog
index d244dcc..d8ba9cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-06 Christian Seiler <christian@iwakd.de>
+
+ [BZ #20444]
+ * sysdeps/mach/hurd/recvmsg.c (__libc_recvmsg): Cope with aport being
+ MACH_PORT_NULL.
+
2016-08-05 Aurelien Jarno <aurelien@aurel32.net>
* math/s_fdim.c: Avoid alias renamed.
diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
index 770a42e..51cfbd7 100644
--- a/sysdeps/mach/hurd/recvmsg.c
+++ b/sysdeps/mach/hurd/recvmsg.c
@@ -64,7 +64,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
&message->msg_flags, amount)))
return __hurd_sockfail (fd, flags, err);
- if (message->msg_name != NULL)
+ if (message->msg_name != NULL && aport != MACH_PORT_NULL)
{
char *buf = message->msg_name;
mach_msg_type_number_t buflen = message->msg_namelen;
@@ -98,6 +98,8 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
if (buflen > 0)
((struct sockaddr *) message->msg_name)->sa_family = type;
}
+ else if (message->msg_name != NULL)
+ message->msg_namelen = 0;
__mach_port_deallocate (__mach_task_self (), aport);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/mach/hurd/recvmsg.c | 4 +++-
2 files changed, 9 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources