|
 |
16b1eb |
From bdb61c66cf0594fef26c6fc790092815c2d09721 Mon Sep 17 00:00:00 2001
|
|
|
16b1eb |
From: Phil Sutter <phil@nwl.cc>
|
|
|
16b1eb |
Date: Tue, 12 Feb 2019 17:31:31 +0100
|
|
|
16b1eb |
Subject: [PATCH] conntrackd: helpers: dhcpv6: Fix potential array overrun
|
|
|
16b1eb |
|
|
|
16b1eb |
The value dhcpv6_msg_type points at is used as index to dhcpv6_timeouts
|
|
|
16b1eb |
array, so upper boundary check has to treat a value of
|
|
|
16b1eb |
ARRAY_SIZE(dhcpv6_timeouts) as invalid.
|
|
|
16b1eb |
|
|
|
16b1eb |
Fixes: 36118bfc4901b ("conntrackd: helpers: add DHCPv6 helper")
|
|
|
16b1eb |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
16b1eb |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
16b1eb |
(cherry picked from commit 764a435c26e29900921ad5cdbd160a466c3c7416)
|
|
|
16b1eb |
---
|
|
|
16b1eb |
src/helpers/dhcpv6.c | 2 +-
|
|
|
16b1eb |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
16b1eb |
|
|
|
16b1eb |
diff --git a/src/helpers/dhcpv6.c b/src/helpers/dhcpv6.c
|
|
|
16b1eb |
index 73632ec181a95..f87b6cebfe157 100644
|
|
|
16b1eb |
--- a/src/helpers/dhcpv6.c
|
|
|
16b1eb |
+++ b/src/helpers/dhcpv6.c
|
|
|
16b1eb |
@@ -72,7 +72,7 @@ dhcpv6_helper_cb(struct pkt_buff *pkt, uint32_t protoff,
|
|
|
16b1eb |
return NF_ACCEPT;
|
|
|
16b1eb |
|
|
|
16b1eb |
dhcpv6_msg_type = pktb_network_header(pkt) + protoff + sizeof(struct udphdr);
|
|
|
16b1eb |
- if (*dhcpv6_msg_type > ARRAY_SIZE(dhcpv6_timeouts)) {
|
|
|
16b1eb |
+ if (*dhcpv6_msg_type >= ARRAY_SIZE(dhcpv6_timeouts)) {
|
|
|
16b1eb |
printf("Dropping DHCPv6 message with bad type %u\n",
|
|
|
16b1eb |
*dhcpv6_msg_type);
|
|
|
16b1eb |
return NF_DROP;
|
|
|
16b1eb |
--
|
|
|
16b1eb |
2.21.0
|
|
|
16b1eb |
|