summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSankar Chokkalingam <sankarx.chokkalingam@intel.com>2016-07-18 11:15:43 -0700
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-07-22 12:40:26 +0200
commit6fe8ecc10cb3824bd73d34f92af02d03d9fd0b8b (patch)
tree30f3fbb73a8d67a293341376dc4d24ce62c03f4f
parent399b2d4758009868a578c618015bf2aa47e222a5 (diff)
downloaddpdk-6fe8ecc10cb3824bd73d34f92af02d03d9fd0b8b.zip
dpdk-6fe8ecc10cb3824bd73d34f92af02d03d9fd0b8b.tar.gz
dpdk-6fe8ecc10cb3824bd73d34f92af02d03d9fd0b8b.tar.xz
examples/ip_pipeline: fix IPv6 flow classification
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: Sankar Chokkalingam <sankarx.chokkalingam@intel.com> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-rw-r--r--examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c6
-rw-r--r--examples/ip_pipeline/pipeline/pipeline_passthrough_be.c4
2 files changed, 5 insertions, 5 deletions
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,