From 2c4ba41bea6d89ade80d67241eaf135e4b55de19 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Wed, 30 Oct 2019 14:46:40 +0100 Subject: dhcp: fix proxy dhcpv6 size check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Type: fix Change-Id: Ibbb25bc530fdeaa3083c9b833a286a5d40e93c1e Signed-off-by: Benoît Ganne (cherry picked from commit 60ad1a59a39872d0eff8ed0961fd81c5854c968b) --- src/vnet/dhcp/dhcp6_proxy_node.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/vnet/dhcp/dhcp6_proxy_node.c b/src/vnet/dhcp/dhcp6_proxy_node.c index 6006f0e23c5..3de3121d3e0 100644 --- a/src/vnet/dhcp/dhcp6_proxy_node.c +++ b/src/vnet/dhcp/dhcp6_proxy_node.c @@ -315,8 +315,9 @@ dhcpv6_proxy_to_server_input (vlib_main_t * vm, link_address_set: - if ((b0->current_length + sizeof (*id1) + sizeof (*vss1) + - sizeof (*cmac)) > vlib_buffer_get_default_data_size (vm)) + if ((b0->current_data + b0->current_length + sizeof (*id1) + + sizeof (*vss1) + sizeof (*cmac)) > + vlib_buffer_get_default_data_size (vm)) { error0 = DHCPV6_PROXY_ERROR_PKT_TOO_BIG; next0 = DHCPV6_PROXY_TO_SERVER_INPUT_NEXT_DROP; -- cgit 1.2.3-korg