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.20-86-gfda389c
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Oct 2014 16:04:59 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-86-gfda389c
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 fda389c8f0311dd5786be91a7b54b9f935fcafa1 (commit)
from fcb32af153a745414b0d949e707c9485ab77d6ba (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=fda389c8f0311dd5786be91a7b54b9f935fcafa1
commit fda389c8f0311dd5786be91a7b54b9f935fcafa1
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Oct 14 21:05:33 2014 +0530
Fix infinite loop in check_pf (BZ #12926)
The recvmsg could return 0 under some conditions and cause the
make_request function to be stuck in an infinite loop.
Thank you Jim King <jim.king@simplivity.com> for posting Paul's patch
on the list.
diff --git a/ChangeLog b/ChangeLog
index e40ba1f..73db084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-14 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ [BZ #12926]
+ * sysdeps/unix/sysv/linux/check_pf.c (make_request): Avoid
+ infinite loop when __recvmsg returns 0.
+
2014-10-10 Joseph Myers <joseph@codesourcery.com>
* CANCEL-FCT-WAIVE: Remove file.
diff --git a/NEWS b/NEWS
index accc144..987f306 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.21
* The following bugs are resolved with this release:
- 6652, 14171, 17266, 17363, 17370, 17371, 17411, 17460.
+ 6652, 12926, 14171, 17266, 17363, 17370, 17371, 17411, 17460.
Version 2.20
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index c7fd9b0..976f249 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -180,7 +180,7 @@ make_request (int fd, pid_t pid)
};
ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
- if (read_len < 0)
+ if (read_len <= 0)
goto out_fail2;
if (msg.msg_flags & MSG_TRUNC)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/check_pf.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources