|
 |
e87dd3 |
From 3947ab0069e443e72debe26379b8517fac8f6e41 Mon Sep 17 00:00:00 2001
|
|
|
e87dd3 |
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
|
e87dd3 |
Date: Mon, 25 Sep 2017 20:19:55 +0100
|
|
|
e87dd3 |
Subject: [PATCH 8/9] Misc code cleanups arising from Google analysis.
|
|
|
e87dd3 |
No security impleications or CVEs.
|
|
|
e87dd3 |
|
|
|
e87dd3 |
---
|
|
|
e87dd3 |
src/edns0.c | 2 +-
|
|
|
e87dd3 |
src/rfc1035.c | 4 +++-
|
|
|
e87dd3 |
src/rfc2131.c | 2 +-
|
|
|
e87dd3 |
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
e87dd3 |
|
|
|
e87dd3 |
diff --git a/src/edns0.c b/src/edns0.c
|
|
|
e87dd3 |
index a8d0167..0552d38 100644
|
|
|
e87dd3 |
--- a/src/edns0.c
|
|
|
e87dd3 |
+++ b/src/edns0.c
|
|
|
e87dd3 |
@@ -159,7 +159,7 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
|
|
|
e87dd3 |
/* delete option if we're to replace it. */
|
|
|
e87dd3 |
p -= 4;
|
|
|
e87dd3 |
rdlen -= len + 4;
|
|
|
e87dd3 |
- memcpy(p, p+len+4, rdlen - i);
|
|
|
e87dd3 |
+ memmove(p, p+len+4, rdlen - i);
|
|
|
e87dd3 |
PUTSHORT(rdlen, lenp);
|
|
|
e87dd3 |
lenp -= 2;
|
|
|
e87dd3 |
}
|
|
|
e87dd3 |
diff --git a/src/rfc1035.c b/src/rfc1035.c
|
|
|
e87dd3 |
index 78410d6..917bac2 100644
|
|
|
e87dd3 |
--- a/src/rfc1035.c
|
|
|
e87dd3 |
+++ b/src/rfc1035.c
|
|
|
e87dd3 |
@@ -37,7 +37,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
|
|
|
e87dd3 |
/* end marker */
|
|
|
e87dd3 |
{
|
|
|
e87dd3 |
/* check that there are the correct no of bytes after the name */
|
|
|
e87dd3 |
- if (!CHECK_LEN(header, p, plen, extrabytes))
|
|
|
e87dd3 |
+ if (!CHECK_LEN(header, p1 ? p1 : p, plen, extrabytes))
|
|
|
e87dd3 |
return 0;
|
|
|
e87dd3 |
|
|
|
e87dd3 |
if (isExtract)
|
|
|
e87dd3 |
@@ -485,6 +485,8 @@ static unsigned char *do_doctor(unsigned char *p, int count, struct dns_header *
|
|
|
e87dd3 |
{
|
|
|
e87dd3 |
unsigned int i, len = *p1;
|
|
|
e87dd3 |
unsigned char *p2 = p1;
|
|
|
e87dd3 |
+ if ((p1 + len - p) >= rdlen)
|
|
|
e87dd3 |
+ return 0; /* bad packet */
|
|
|
e87dd3 |
/* make counted string zero-term and sanitise */
|
|
|
e87dd3 |
for (i = 0; i < len; i++)
|
|
|
e87dd3 |
{
|
|
|
e87dd3 |
diff --git a/src/rfc2131.c b/src/rfc2131.c
|
|
|
e87dd3 |
index 75893a6..71d5846 100644
|
|
|
e87dd3 |
--- a/src/rfc2131.c
|
|
|
e87dd3 |
+++ b/src/rfc2131.c
|
|
|
e87dd3 |
@@ -155,7 +155,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
|
|
e87dd3 |
for (offset = 0; offset < (len - 5); offset += elen + 5)
|
|
|
e87dd3 |
{
|
|
|
e87dd3 |
elen = option_uint(opt, offset + 4 , 1);
|
|
|
e87dd3 |
- if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA)
|
|
|
e87dd3 |
+ if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA && offset + elen + 5 <= len)
|
|
|
e87dd3 |
{
|
|
|
e87dd3 |
unsigned char *x = option_ptr(opt, offset + 5);
|
|
|
e87dd3 |
unsigned char *y = option_ptr(opt, offset + elen + 5);
|
|
|
e87dd3 |
--
|
|
|
e87dd3 |
2.9.5
|
|
|
e87dd3 |
|