dnsmasq: backport validation fix in dnssec security fix
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Sat, 20 Jan 2018 08:46:28 +0000 (08:46 +0000)
committerJo-Philipp Wich <jo@mein.io>
Sat, 20 Jan 2018 13:22:39 +0000 (14:22 +0100)
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 <ldir@darbyshire-bryant.me.uk>
package/network/services/dnsmasq/Makefile
package/network/services/dnsmasq/patches/270-dnssec-wildcards.patch

index 3ef7a31..7ba7d56 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.78
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/
index 029e7ea..d13ac2c 100644 (file)
@@ -160,7 +160,7 @@ in a domain which includes a wildcard for NSEC.
 +                     int type_covered;
 +                     unsigned char *psav = p1;
 +                     
-+                     if (rdlen < 18)
++                     if (rdlen1 < 18)
 +                       return 0; /* bad packet */
 +
 +                     GETSHORT(type_covered, p1);