r6306 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2014-10-22 13:13:42 +0000 (Wed, 22 Oct 2014)
New Revision: 6306
Added:
glibc-package/trunk/debian/patches/any/cvs-check_pf-infinite-loop.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/any/cvs-check_pf-infinite-loop.diff: new patch from upstream to
fix an infinite loop in infinite loop in check_pf.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-10-22 09:12:25 UTC (rev 6305)
+++ glibc-package/trunk/debian/changelog 2014-10-22 13:13:42 UTC (rev 6306)
@@ -32,6 +32,8 @@
Workarounds a kfreebsd 9.0 to 10.1 ABI break. Closes: #740509.
* patches/any/cvs-CVE-2014-6040.diff: new patch from upstream to fix crashes
on invalid input in IBM gconv modules (CVE-2014-6040).
+ * patches/any/cvs-check_pf-infinite-loop.diff: new patch from upstream to
+ fix an infinite loop in infinite loop in check_pf.
[ Helmut Grohne ]
* debian/patches/any/local-bootstrap-headers.diff: Update to handle
Added: glibc-package/trunk/debian/patches/any/cvs-check_pf-infinite-loop.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-check_pf-infinite-loop.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-check_pf-infinite-loop.diff 2014-10-22 13:13:42 UTC (rev 6306)
@@ -0,0 +1,19 @@
+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.
+
+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_fail;
+
+ if (msg.msg_flags & MSG_TRUNC)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2014-10-22 09:12:25 UTC (rev 6305)
+++ glibc-package/trunk/debian/patches/series 2014-10-22 13:13:42 UTC (rev 6306)
@@ -267,3 +267,4 @@
any/cvs-CVE-2014-0475.diff
any/cvs-CVE-2014-5119.diff
any/cvs-CVE-2014-6040.diff
+any/cvs-check_pf-infinite-loop.diff
Reply to: