r2315 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2007-05-30 12:43:38 +0000 (Wed, 30 May 2007)
New Revision: 2315
Added:
glibc-package/trunk/debian/patches/any/cvs-nscd-short-replies.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* any/cvs-nscd-short-replies.diff: new patch from CVS to fix crash on
short replies.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-30 11:49:10 UTC (rev 2314)
+++ glibc-package/trunk/debian/changelog 2007-05-30 12:43:38 UTC (rev 2315)
@@ -7,6 +7,8 @@
* any/submitted-strtok.diff: new patch to fix a typo in strings/strtok.c.
Closes: #426118.
* debian/sysdeps/depflags.pl: depends on libgcc1/libgcc2/libgcc4.
+ * any/cvs-nscd-short-replies.diff: new patch from CVS to fix crash on
+ short replies.
[ Clint Adams ]
* debian/local/manpages/ld.so.8: quote accepted values for LD_DEBUG.
@@ -14,7 +16,7 @@
* New Malayalam debconf translation, by Sajeev പിആര്. closes:
#426203.
- -- Aurelien Jarno <aurel32@debian.org> Wed, 30 May 2007 13:40:55 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 30 May 2007 14:42:41 +0200
glibc (2.5-9) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-nscd-short-replies.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-nscd-short-replies.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-nscd-short-replies.diff 2007-05-30 12:43:38 UTC (rev 2315)
@@ -0,0 +1,32 @@
+2007-05-29 Ulrich Drepper <drepper@redhat.com>
+
+ * nscd/nscd_helper.c (get_mapping): Handle short replies instead
+ of crashing. When this is the case or if the reply is malformed,
+ don't try to close the new file descriptor since it does not
+ exist.
+ Patch in part by Guillaume Chazarain <guichaz@yahoo.fr>.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nscd/nscd_helper.c,v
+retrieving revision 1.22
+retrieving revision 1.24
+diff -u -r1.22 -r1.24
+--- libc/nscd/nscd_helper.c 2007/02/16 06:34:19 1.22
++++ libc/nscd/nscd_helper.c 2007/05/29 15:04:02 1.24
+@@ -269,11 +269,12 @@
+ != keylen, 0))
+ goto out_close2;
+
+- mapfd = *(int *) CMSG_DATA (cmsg);
++ if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
++ || (CMSG_FIRSTHDR (&msg)->cmsg_len
++ != CMSG_LEN (sizeof (int))), 0))
++ goto out_close2;
+
+- if (__builtin_expect (CMSG_FIRSTHDR (&msg)->cmsg_len
+- != CMSG_LEN (sizeof (int)), 0))
+- goto out_close;
++ mapfd = *(int *) CMSG_DATA (cmsg);
+
+ struct stat64 st;
+ if (__builtin_expect (strcmp (resdata, key) != 0, 0)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-05-30 11:49:10 UTC (rev 2314)
+++ glibc-package/trunk/debian/patches/series 2007-05-30 12:43:38 UTC (rev 2315)
@@ -111,6 +111,7 @@
any/cvs-bits_in_h-ipv6.diff -p1
any/cvs-itoa-c.diff -p1
any/cvs-lt-update.diff -p0
+any/cvs-nscd-short-replies.diff -p1
any/cvs-realpath.diff -p1
any/cvs-vfprintf-stack-smashing.diff
any/cvs-zdump-64-bit.diff -p1
Reply to: