domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: backport validation fix in dnssec security fix

Browse Source 
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>
This commit is contained in:
Kevin Darbyshire-Bryant
2018-01-20 08:46:28 +00:00
committed by Jo-Philipp Wich
parent a3198061f8
commit adaf1cbcc8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View File

@@ -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/

2
package/network/services/dnsmasq/patches/270-dnssec-wildcards.patch
View File

@@ -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);