pullup:

1152.   [bug]           libbind: read buffer overflows.

diff --git a/CHANGES b/CHANGES
index 229f34969e0aac2ee6202a0c9cd5bd52268983a5..9c0a3b33e1ad9570159f63f0455b65ed8b134861 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,8 @@
 1154.  [bug]           Don't attempt to obtain the netmask of a interface
                        if there is no address configured.  [RT #2176]
 
+1152.  [bug]           libbind: read buffer overflows.
+
 1144.  [bug]           rndc-confgen would crash if both the -a and -t
                        options were specified. [RT #2159]
 

diff --git a/lib/bind/irs/dns_nw.c b/lib/bind/irs/dns_nw.c
index ab93ff5be6886a84471e8fdaa305dc2414464796..43a404edd9991be73271f91f92b365890f112048 100644 (file)
--- a/lib/bind/irs/dns_nw.c
+++ b/lib/bind/irs/dns_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_nw.c,v 1.3 2001/04/03 06:42:21 marka Exp $";
+static const char rcsid[] = "$Id: dns_nw.c,v 1.3.2.1 2002/01/22 04:15:44 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -56,11 +56,7 @@ static const char rcsid[] = "$Id: dns_nw.c,v 1.3 2001/04/03 06:42:21 marka Exp $
 
 #define        MAXALIASES      35
 
-#if PACKETSZ > 1024
-#define        MAXPACKET       PACKETSZ
-#else
-#define        MAXPACKET       1024
-#endif
+#define        MAXPACKET       (64*1024)
 
 struct pvt {
        struct nwent    net;

diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c
index ba91e832b5e1f18ea2a6d5c880de23e98be59337..f2c533d611c54bf7e6a23a6050261066084f559e 100644 (file)
--- a/lib/bind/irs/getaddrinfo.c
+++ b/lib/bind/irs/getaddrinfo.c
@@ -172,11 +172,7 @@ static const struct explore explore[] = {
 
 #define PTON_MAX       16
 
-#if PACKETSZ > 1024
-#define MAXPACKET      PACKETSZ
-#else
-#define MAXPACKET      1024
-#endif
+#define MAXPACKET      (1024*64)
 
 typedef union {
        HEADER hdr;