Author: aurel32
Date: 2010-01-06 08:36:00 +0000 (Wed, 06 Jan 2010)
New Revision: 4057

Added:
   glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * Add debian/patches/any/cvs-resolv-edns0.diff to handle overly large
    answer buffers in resolver.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2010-01-05 23:52:01 UTC (rev 
4056)
+++ glibc-package/trunk/debian/changelog        2010-01-06 08:36:00 UTC (rev 
4057)
@@ -16,11 +16,13 @@
     uninitialized variable in resolv code.
   * Add debian/patches/any/cvs-resolv-bindv6only.diff to not use 
     IPV4-mapped addresses in the resolver code.  Closes: #563552.
+  * Add debian/patches/any/cvs-resolv-edns0.diff to handle overly large
+    answer buffers in resolver.
 
   [ Petr Salinger]
   * kfreebsd/local-sysdeps.diff: update to revision 2907 (from glibc-bsd).
 
- -- Aurelien Jarno <aure...@debian.org>  Wed, 06 Jan 2010 00:34:08 +0100
+ -- Aurelien Jarno <aure...@debian.org>  Wed, 06 Jan 2010 09:34:51 +0100
 
 eglibc (2.10.2-3) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff                
                (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-edns0.diff        
2010-01-06 08:36:00 UTC (rev 4057)
@@ -0,0 +1,19 @@
+2009-07-16  Ulrich Drepper  <drep...@redhat.com>
+
+       [BZ #10360]
+       * resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store
+       0xffff in the EDNS0 record.
+
+diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
+index ae0cdb4..2dda4c0 100644
+--- a/resolv/res_mkquery.c
++++ b/resolv/res_mkquery.c
+@@ -244,7 +244,7 @@ __res_nopt(res_state statp,
+       *cp++ = 0;      /* "." */
+ 
+       NS_PUT16(T_OPT, cp);    /* TYPE */
+-      NS_PUT16(anslen & 0xffff, cp);  /* CLASS = UDP payload size */
++      NS_PUT16(MIN(anslen, 0xffff), cp);      /* CLASS = UDP payload size */
+       *cp++ = NOERROR;        /* extended RCODE */
+       *cp++ = 0;              /* EDNS version */
+       /* XXX Once we support DNSSEC we change the flag value here.  */

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2010-01-05 23:52:01 UTC (rev 
4056)
+++ glibc-package/trunk/debian/patches/series   2010-01-06 08:36:00 UTC (rev 
4057)
@@ -224,3 +224,4 @@
 any/cvs-resolv-init.diff
 any/cvs-resolv-uninitialized.diff
 any/cvs-resolv-bindv6only.diff
+any/cvs-resolv-edns0.diff


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to