2020-07-28 16:39:08 +08:00
|
|
|
From 4d3ef152a5d0a3cf053d41ea950823bfcc0ea5c2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: xiaoweiwei <xiaoweiwei5@huawei.com>
|
|
|
|
|
Date: Tue, 28 Jul 2020 10:32:50 +0800
|
|
|
|
|
Subject: [PATCH] underflow
|
2019-09-30 10:37:06 -04:00
|
|
|
|
|
|
|
|
---
|
2020-07-28 16:39:08 +08:00
|
|
|
src/rfc1035.c | 3 +++
|
|
|
|
|
1 file changed, 3 insertions(+)
|
2019-09-30 10:37:06 -04:00
|
|
|
|
|
|
|
|
diff --git a/src/rfc1035.c b/src/rfc1035.c
|
2020-07-28 16:39:08 +08:00
|
|
|
index fefe63d..d3cce6f 100644
|
2019-09-30 10:37:06 -04:00
|
|
|
--- a/src/rfc1035.c
|
|
|
|
|
+++ b/src/rfc1035.c
|
2020-07-28 16:39:08 +08:00
|
|
|
@@ -1340,6 +1340,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
|
2019-09-30 10:37:06 -04:00
|
|
|
size_t len;
|
2020-07-28 16:39:08 +08:00
|
|
|
int rd_bit = (header->hb3 & HB3_RD);
|
2019-09-30 10:37:06 -04:00
|
|
|
|
2020-07-28 16:39:08 +08:00
|
|
|
+ // Make sure we do not underflow here too
|
|
|
|
|
+ if (qlen > (limit - ((char *)header))) return 0;
|
|
|
|
|
+
|
|
|
|
|
/* never answer queries with RD unset, to avoid cache snooping. */
|
2019-09-30 10:37:06 -04:00
|
|
|
if (ntohs(header->ancount) != 0 ||
|
|
|
|
|
ntohs(header->nscount) != 0 ||
|
|
|
|
|
--
|
2020-07-28 16:39:08 +08:00
|
|
|
1.8.3.1
|
2019-09-30 10:37:06 -04:00
|
|
|
|