From: Benoît Ganne <bganne@cisco.com>
Date: Fri, 17 Jul 2020 09:54:28 +0000 (+0200)
Subject: feature: fix feature config data initialization overflow
X-Git-Tag: v21.01-rc0~172
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=c79a14f13a0db6f59123e0e6b0b71d4f24433b01;p=vpp.git

feature: fix feature config data initialization overflow

Copy only exactly the data provided by the user even when it is not a
4-bytes multiple.

Type: fix

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

diff --git a/src/vnet/config.c b/src/vnet/config.c
index 59375746af5..4e9fa36dfc3 100644
--- a/src/vnet/config.c
+++ b/src/vnet/config.c
@@ -331,11 +331,16 @@ vnet_config_add_feature (vlib_main_t * vm,
   f->feature_index = feature_index;
   f->node_index = node_index;
 
-  n_feature_config_u32s =
-    round_pow2 (n_feature_config_bytes,
-		sizeof (f->feature_config[0])) /
-    sizeof (f->feature_config[0]);
-  vec_add (f->feature_config, feature_config, n_feature_config_u32s);
+  if (n_feature_config_bytes)
+    {
+      n_feature_config_u32s =
+	round_pow2 (n_feature_config_bytes,
+		    sizeof (f->feature_config[0])) /
+	sizeof (f->feature_config[0]);
+      vec_validate (f->feature_config, n_feature_config_u32s - 1);
+      clib_memcpy_fast (f->feature_config, feature_config,
+			n_feature_config_bytes);
+    }
 
   /* Sort (prioritize) features. */
   if (vec_len (new_features) > 1)