diff mbox

[dpdk-dev] ip_pipeline: Fix for Flow Classifcation IPv6 configuration error

Message ID 1468865743-2108-1-git-send-email-sankarx.chokkalingam@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Chokkalingam, SankarX July 18, 2016, 6:15 p.m. UTC 
  IP Pipeline application with the configuration for Flow Classification IPV6 did not instantiate.
Parse error in section "PIPELINE1": entry "dma_src_mask" too long

The dma_src_mask check in pipeline_passthrough_parse_args() is wrong.

This fix increases the length of dma_src_mask by 1 for NULL termination
and corrected the validation of dma_src_mask length.
This fix is also propagated to pipeline_fc_parse_args() for key_mask_str validation.

Signed-off-by: Chokkalingam, SankarX <sankarx.chokkalingam@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c | 6 +++---
 examples/ip_pipeline/pipeline/pipeline_passthrough_be.c         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Thomas Monjalon July 22, 2016, 10:21 a.m. UTC | #1 
2016-07-18 11:15, Chokkalingam, SankarX:
> IP Pipeline application with the configuration for Flow Classification IPV6 did not instantiate.
> Parse error in section "PIPELINE1": entry "dma_src_mask" too long
> 
> The dma_src_mask check in pipeline_passthrough_parse_args() is wrong.
> 
> This fix increases the length of dma_src_mask by 1 for NULL termination
> and corrected the validation of dma_src_mask length.
> This fix is also propagated to pipeline_fc_parse_args() for key_mask_str validation.
> 
> Signed-off-by: Chokkalingam, SankarX <sankarx.chokkalingam@intel.com>
> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c
index 8a762bc..026f00c 100644
--- a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c
@@ -221,7 +221,7 @@  pipeline_fc_parse_args(struct pipeline_flow_classification *p,
 	uint32_t flow_id_offset_present = 0;
 
 	uint32_t i;
-	char key_mask_str[PIPELINE_FC_FLOW_KEY_MAX_SIZE * 2];
+	char key_mask_str[PIPELINE_FC_FLOW_KEY_MAX_SIZE * 2 + 1];
 
 	p->hash_offset = 0;
 
@@ -303,13 +303,13 @@  pipeline_fc_parse_args(struct pipeline_flow_classification *p,
 				params->name, arg_name);
 			key_mask_present = 1;
 
-			PIPELINE_ARG_CHECK((mask_str_len <
+			PIPELINE_ARG_CHECK((mask_str_len <=
 				(PIPELINE_FC_FLOW_KEY_MAX_SIZE * 2)),
 				"Parse error in section \"%s\": entry "
 				"\"%s\" is too long", params->name,
 				arg_name);
 
-			snprintf(key_mask_str, sizeof(key_mask_str), "%s",
+			snprintf(key_mask_str, mask_str_len + 1, "%s",
 				arg_value);
 
 			continue;
diff --git a/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c b/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
index 6146a28..356f02d 100644
--- a/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_passthrough_be.c
@@ -366,7 +366,7 @@  pipeline_passthrough_parse_args(struct pipeline_passthrough_params *p,
 	uint32_t dma_hash_offset_present = 0;
 	uint32_t lb_present = 0;
 	uint32_t i;
-	char dma_mask_str[PIPELINE_PASSTHROUGH_DMA_SIZE_MAX * 2];
+	char dma_mask_str[PIPELINE_PASSTHROUGH_DMA_SIZE_MAX * 2 + 1];
 
 	/* default values */
 	p->dma_enabled = 0;
@@ -454,7 +454,7 @@  pipeline_passthrough_parse_args(struct pipeline_passthrough_params *p,
 				params->name, arg_name);
 			dma_src_mask_present = 1;
 
-			PIPELINE_ARG_CHECK((mask_str_len <
+			PIPELINE_ARG_CHECK((mask_str_len <=
 				(PIPELINE_PASSTHROUGH_DMA_SIZE_MAX * 2)),
 				"Parse error in section \"%s\": entry "
 				"\"%s\" too long", params->name,