From: Benoît Ganne <bganne@cisco.com>
Date: Sat, 7 Dec 2019 16:14:27 +0000 (-0700)
Subject: ipsec: make sure pad_bytes does not exceed pad data size
X-Git-Tag: v19.08.3~235
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=299f9caae6975f1642462963e1df3deef343acfa;p=vpp.git

ipsec: make sure pad_bytes does not exceed pad data size

This helps GCC understand the memcpy will not overflow pad_data. GCC-6
(default on Debian 9) in particular got confused.

Type: fix

Change-Id: I176eb01531b9d5c7ebec40f015e510b2d56e77c4
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit 4505f0154eaba59c432c869b65e2dc493837032a)
---

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index 186e122793d..6170603ded1 100644
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -114,7 +114,11 @@ esp_add_footer_and_icv (vlib_buffer_t * b, u8 block_size, u8 icv_sz,
     }
 
   if (pad_bytes)
-    clib_memcpy_fast ((u8 *) f - pad_bytes, pad_data, pad_bytes);
+    {
+      ASSERT (pad_bytes <= ESP_MAX_BLOCK_SIZE);
+      pad_bytes = clib_min (ESP_MAX_BLOCK_SIZE, pad_bytes);
+      clib_memcpy_fast ((u8 *) f - pad_bytes, pad_data, pad_bytes);
+    }
 
   f->pad_length = pad_bytes;
   b->current_length = new_length + icv_sz;