diff options
| author |   Ricardo Salveti <ricardo.salveti@linaro.org> | 2016-07-25 13:22:22 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo.salveti@linaro.org> | 2016-07-25 13:23:50 -0300 |
| commit | 7b53c036e6bf56623b8273018ff1c8cc62847857 (patch) | |
| tree | 4af0da8c150bbebd7d1d252d6ac801a7efef0d23 /examples/ip_pipeline/pipeline | |
| parent | 5d4e5dcd8a186778b3d78e27c81550d07a288fd2 (diff) | |
Imported Upstream version 16.07-rc4
Change-Id: Ic57f6a3726f2dbd1682223648d91310f45705327
Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>
Diffstat (limited to 'examples/ip_pipeline/pipeline')
3 files changed, 8 insertions, 6 deletions
diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_actions.c b/examples/ip_pipeline/pipeline/pipeline_flow_actions.c index bf12fd7b..349db6b1 100644 --- a/examples/ip_pipeline/pipeline/pipeline_flow_actions.c +++ b/examples/ip_pipeline/pipeline/pipeline_flow_actions.c @@ -290,6 +290,7 @@ app_pipeline_fa_flow_config_bulk(struct app_params *app, void **req_entry_ptr; uint32_t *req_flow_id; uint32_t i; + int status; /* Check input arguments */ if ((app == NULL) || @@ -368,6 +369,7 @@ app_pipeline_fa_flow_config_bulk(struct app_params *app, } /* Read response */ + status = (rsp->n_flows == n_flows) ? 0 : -1; /* Commit flows */ for (i = 0; i < rsp->n_flows; i++) { @@ -408,7 +410,7 @@ app_pipeline_fa_flow_config_bulk(struct app_params *app, rte_free(req_flow_id); rte_free(req_entry_ptr); - return (rsp->n_flows == n_flows) ? 0 : -1; + return status; } int diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c index 8a762bc7..026f00cd 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 6146a28f..356f02d0 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, |