1 From d4f2e0b8d8f0b5daa0d468f62a0d5f1df58ac325 Mon Sep 17 00:00:00 2001
2 From: Doran Moppert <dmoppert@redhat.com>
3 Date: Tue, 26 Sep 2017 14:48:20 +0930
4 Subject: [PATCH 9/9] google patch hand-applied
7 src/edns0.c | 10 +++++-----
9 src/rfc1035.c | 6 ++++--
10 3 files changed, 13 insertions(+), 7 deletions(-)
12 diff --git a/src/edns0.c b/src/edns0.c
13 index 0552d38..bec4a36 100644
16 @@ -212,11 +212,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
17 /* Copy back any options */
20 - if (p + rdlen > limit)
23 - return plen; /* Too big */
25 + if (p + rdlen > limit)
28 + return plen; /* Too big */
30 memcpy(p, buff, rdlen);
33 diff --git a/src/forward.c b/src/forward.c
34 index 0f8f462..a729c06 100644
37 @@ -1412,6 +1412,10 @@ void receive_query(struct listener *listen, time_t now)
38 udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */
41 + // Make sure the udp size is not smaller than the incoming message so that we
43 + if (udp_size < n) udp_size = n;
48 diff --git a/src/rfc1035.c b/src/rfc1035.c
49 index 917bac2..ae65702 100644
52 @@ -1182,8 +1182,8 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int
53 va_end(ap); /* clean up variable argument pointer */
56 - /* this has already been checked against limit before */
57 - PUTSHORT(j, sav); /* Now, store real RDLength */
58 + /* this has already been checked against limit before */
59 + PUTSHORT(j, sav); /* Now, store real RDLength */
61 /* check for overflow of buffer */
62 if (limit && ((unsigned char *)limit - p) < 0)
63 @@ -1243,6 +1243,8 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
64 int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1;
65 struct mx_srv_record *rec;
67 + // Make sure we do not underflow here too.
68 + if (qlen > (limit - ((char *)header))) return 0;
70 if (ntohs(header->ancount) != 0 ||
71 ntohs(header->nscount) != 0 ||