Explorar o código

dnsmasq: backport validation fix in dnssec security fix

A DNSSEC validation error was introduced in the fix for CVE-2017-15107

Backport the upstream fix to the fix (a simple typo)

Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
Kevin Darbyshire-Bryant %!s(int64=8) %!d(string=hai) anos
pai
achega
adaf1cbcc8

+ 1 - 1
package/network/services/dnsmasq/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=dnsmasq
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.78
 PKG_VERSION:=2.78
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/

+ 1 - 1
package/network/services/dnsmasq/patches/270-dnssec-wildcards.patch

@@ -160,7 +160,7 @@ in a domain which includes a wildcard for NSEC.
 +		       int type_covered;
 +		       int type_covered;
 +		       unsigned char *psav = p1;
 +		       unsigned char *psav = p1;
 +		       
 +		       
-+		       if (rdlen < 18)
++		       if (rdlen1 < 18)
 +			 return 0; /* bad packet */
 +			 return 0; /* bad packet */
 +
 +
 +		       GETSHORT(type_covered, p1);
 +		       GETSHORT(type_covered, p1);