From: Benoît Ganne <bganne@cisco.com>
Date: Wed, 30 Oct 2019 13:46:40 +0000 (+0100)
Subject: dhcp: fix proxy dhcpv6 size check
X-Git-Tag: v20.05-rc0~476
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=60ad1a59a39872d0eff8ed0961fd81c5854c968b;p=vpp.git

dhcp: fix proxy dhcpv6 size check

Type: fix

Change-Id: Ibbb25bc530fdeaa3083c9b833a286a5d40e93c1e
Signed-off-by: Benoît Ganne <bganne@cisco.com>
---

diff --git a/src/plugins/dhcp/dhcp6_proxy_node.c b/src/plugins/dhcp/dhcp6_proxy_node.c
index 929b49e2b41..272c379b6a3 100644
--- a/src/plugins/dhcp/dhcp6_proxy_node.c
+++ b/src/plugins/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;