aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-03-09 08:40:57 +0000
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2019-07-25 12:23:46 +0100
commite9eec39aacde450ba87598d85987b374ce6aed95 (patch)
tree3823546edc4d7228951ea9e37f55f6fea3f06833 /package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch
parent7d684b7673a7cb4f3fef366dd4f621f62fc4019c (diff)
downloadupstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.gz
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.bz2
upstream-e9eec39aacde450ba87598d85987b374ce6aed95.zip
dnsmasq: backport latest patches
Backport upstream patches pre 2.81rc for testing purposes. Let's see what falls out! Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch')
-rw-r--r--package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch b/package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch
new file mode 100644
index 0000000000..ddbdb451d2
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0056-Fix-wrong-return-code-from-explore_rrset-with-some-e.patch
@@ -0,0 +1,31 @@
+From 05299fdd5a3b6ace43224c7d27d06a57b175639f Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Mon, 15 Jul 2019 22:04:20 +0100
+Subject: [PATCH 56/57] Fix wrong return code from explore_rrset() with some
+ errors.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/dnssec.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/dnssec.c
++++ b/src/dnssec.c
+@@ -374,7 +374,7 @@ static int explore_rrset(struct dns_head
+ int gotkey = 0;
+
+ if (!(p = skip_questions(header, plen)))
+- return STAT_BOGUS;
++ return 0;
+
+ /* look for RRSIGs for this RRset and get pointers to each RR in the set. */
+ for (rrsetidx = 0, sigidx = 0, j = ntohs(header->ancount) + ntohs(header->nscount);
+@@ -386,7 +386,7 @@ static int explore_rrset(struct dns_head
+ pstart = p;
+
+ if (!(res = extract_name(header, plen, &p, name, 0, 10)))
+- return STAT_BOGUS; /* bad packet */
++ return 0; /* bad packet */
+
+ GETSHORT(stype, p);
+ GETSHORT(sclass, p);