|
 |
e87dd3 |
From 2c1aec1e979a209eb2f2b035314a8c973b4ac269 Mon Sep 17 00:00:00 2001
|
|
|
e87dd3 |
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
|
e87dd3 |
Date: Thu, 7 Sep 2017 20:45:00 +0100
|
|
|
e87dd3 |
Subject: [PATCH 7/9] Don't return arcount=1 if EDNS0 RR won't fit in the
|
|
|
e87dd3 |
packet.
|
|
|
e87dd3 |
|
|
|
e87dd3 |
Omitting the EDNS0 RR but setting arcount gives a malformed packet.
|
|
|
e87dd3 |
Also, don't accept UDP packet size less than 512 in recieved EDNS0.
|
|
|
e87dd3 |
---
|
|
|
e87dd3 |
src/edns0.c | 5 ++++-
|
|
|
e87dd3 |
src/forward.c | 2 ++
|
|
|
e87dd3 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
e87dd3 |
|
|
|
e87dd3 |
diff --git a/src/edns0.c b/src/edns0.c
|
|
|
e87dd3 |
index 5bdc133..a8d0167 100644
|
|
|
e87dd3 |
--- a/src/edns0.c
|
|
|
e87dd3 |
+++ b/src/edns0.c
|
|
|
e87dd3 |
@@ -221,7 +221,10 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
|
|
|
e87dd3 |
free(buff);
|
|
|
e87dd3 |
p += rdlen;
|
|
|
e87dd3 |
}
|
|
|
e87dd3 |
- header->arcount = htons(ntohs(header->arcount) + 1);
|
|
|
e87dd3 |
+
|
|
|
e87dd3 |
+ /* Only bump arcount if RR is going to fit */
|
|
|
e87dd3 |
+ if (((ssize_t)optlen) <= (limit - (p + 4)))
|
|
|
e87dd3 |
+ header->arcount = htons(ntohs(header->arcount) + 1);
|
|
|
e87dd3 |
}
|
|
|
e87dd3 |
|
|
|
e87dd3 |
if (((ssize_t)optlen) > (limit - (p + 4)))
|
|
|
e87dd3 |
diff --git a/src/forward.c b/src/forward.c
|
|
|
e87dd3 |
index 9b464d3..0f8f462 100644
|
|
|
e87dd3 |
--- a/src/forward.c
|
|
|
e87dd3 |
+++ b/src/forward.c
|
|
|
e87dd3 |
@@ -1408,6 +1408,8 @@ void receive_query(struct listener *listen, time_t now)
|
|
|
e87dd3 |
defaults to 512 */
|
|
|
e87dd3 |
if (udp_size > daemon->edns_pktsz)
|
|
|
e87dd3 |
udp_size = daemon->edns_pktsz;
|
|
|
e87dd3 |
+ else if (udp_size < PACKETSZ)
|
|
|
e87dd3 |
+ udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */
|
|
|
e87dd3 |
}
|
|
|
e87dd3 |
|
|
|
e87dd3 |
#ifdef HAVE_AUTH
|
|
|
e87dd3 |
--
|
|
|
e87dd3 |
2.9.5
|
|
|
e87dd3 |
|