e87dd3
From 5086b12a4b1269d1576b5bab01f72c6fa19c55bc Mon Sep 17 00:00:00 2001
e87dd3
From: Simon Kelley <simon@thekelleys.org.uk>
e87dd3
Date: Mon, 25 Sep 2017 18:52:50 +0100
e87dd3
Subject: [PATCH 3/9]     Security fix, CVE-2017-14493, DHCPv6 - Stack buffer
e87dd3
 overflow.
e87dd3
e87dd3
    Fix stack overflow in DHCPv6 code. An attacker who can send
e87dd3
    a DHCPv6 request to dnsmasq can overflow the stack frame and
e87dd3
    crash or control dnsmasq.
e87dd3
---
e87dd3
 src/rfc3315.c | 3 +++
e87dd3
 1 file changed, 3 insertions(+)
e87dd3
e87dd3
diff --git a/src/rfc3315.c b/src/rfc3315.c
e87dd3
index 73bdee4..8d18a28 100644
e87dd3
--- a/src/rfc3315.c
e87dd3
+++ b/src/rfc3315.c
e87dd3
@@ -206,6 +206,9 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz,
e87dd3
   /* RFC-6939 */
e87dd3
   if ((opt = opt6_find(opts, end, OPTION6_CLIENT_MAC, 3)))
e87dd3
     {
e87dd3
+      if (opt6_len(opt) - 2 > DHCP_CHADDR_MAX) {
e87dd3
+        return 0;
e87dd3
+      }
e87dd3
       state->mac_type = opt6_uint(opt, 0, 2);
e87dd3
       state->mac_len = opt6_len(opt) - 2;
e87dd3
       memcpy(&state->mac[0], opt6_ptr(opt, 2), state->mac_len);
e87dd3
-- 
e87dd3
2.9.5
e87dd3