[Midnightbsd-cvs] src [6967] trunk: Fix two security vulnerabilities.

[laffer1 at midnightbsd.org]

Revision: 6967
          http://svnweb.midnightbsd.org/src/?rev=6967
Author:   laffer1
Date:     2015-02-25 09:43:47 -0500 (Wed, 25 Feb 2015)
Log Message:
-----------
Fix two security vulnerabilities.

Modified Paths:
--------------
    trunk/contrib/bind98/lib/dns/zone.c
    trunk/sys/netinet/igmp.c

Modified: trunk/contrib/bind98/lib/dns/zone.c
===================================================================
--- trunk/contrib/bind98/lib/dns/zone.c	2015-02-25 14:38:00 UTC (rev 6966)
+++ trunk/contrib/bind98/lib/dns/zone.c	2015-02-25 14:43:47 UTC (rev 6967)
@@ -7873,6 +7873,12 @@
 					     namebuf, tag);
 				trustkey = ISC_TRUE;
 			}
+		} else {
+			/*
+			 * No previously known key, and the key is not
+			 * secure, so skip it.
+			 */
+			continue;
 		}
 
 		/* Delete old version */
@@ -7921,7 +7927,7 @@
 			trust_key(zone, keyname, &dnskey, mctx);
 		}
 
-		if (!deletekey)
+		if (secure && !deletekey)
 			set_refreshkeytimer(zone, &keydata, now);
 	}
 

Modified: trunk/sys/netinet/igmp.c
===================================================================
--- trunk/sys/netinet/igmp.c	2015-02-25 14:38:00 UTC (rev 6966)
+++ trunk/sys/netinet/igmp.c	2015-02-25 14:43:47 UTC (rev 6967)
@@ -1532,8 +1532,8 @@
 		case IGMP_VERSION_3: {
 				struct igmpv3 *igmpv3;
 				uint16_t igmpv3len;
-				uint16_t srclen;
-				int nsrc;
+				uint16_t nsrc;
+				int srclen;
 
 				IGMPSTAT_INC(igps_rcv_v3_queries);
 				igmpv3 = (struct igmpv3 *)igmp;