The memory get from strdup should be freed when parameter parsing
finished, and also should be freed when error occurs.

Fixes: 814d01709328 ("eventdev/eth_rx: support telemetry")
Fixes: 9e583185318f ("eventdev/eth_rx: support telemetry")

Signed-off-by: Weiguo Li <liw...@foxmail.com>
---
 lib/eventdev/rte_event_eth_rx_adapter.c | 39 +++++++++++++++++--------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index ae1e260c08..44775575a2 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3337,21 +3337,24 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
        RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get device ID from parameter string */
        eth_dev_id = strtoul(token, NULL, 10);
        RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get Rx queue ID from parameter string */
        rx_queue_id = strtoul(token, NULL, 10);
        if (rx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_rx_queues) {
                RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", rx_queue_id);
+               free(l_params);
                return -EINVAL;
        }
 
@@ -3359,6 +3362,8 @@ handle_rxa_get_queue_conf(const char *cmd __rte_unused,
        if (token != NULL)
                RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
                                 " telemetry command, ignoring");
+       /* Parsing parameter finished */
+       free(l_params);
 
        if (rte_event_eth_rx_adapter_queue_conf_get(rx_adapter_id, eth_dev_id,
                                                    rx_queue_id, &queue_conf)) {
@@ -3401,21 +3406,24 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
        RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get device ID from parameter string */
        eth_dev_id = strtoul(token, NULL, 10);
        RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get Rx queue ID from parameter string */
        rx_queue_id = strtoul(token, NULL, 10);
        if (rx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_rx_queues) {
                RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", rx_queue_id);
+               free(l_params);
                return -EINVAL;
        }
 
@@ -3423,6 +3431,8 @@ handle_rxa_get_queue_stats(const char *cmd __rte_unused,
        if (token != NULL)
                RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
                                 " telemetry command, ignoring");
+       /* Parsing parameter finished */
+       free(l_params);
 
        if (rte_event_eth_rx_adapter_queue_stats_get(rx_adapter_id, eth_dev_id,
                                                    rx_queue_id, &q_stats)) {
@@ -3463,21 +3473,24 @@ handle_rxa_queue_stats_reset(const char *cmd 
__rte_unused,
        RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(rx_adapter_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get device ID from parameter string */
        eth_dev_id = strtoul(token, NULL, 10);
        RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(eth_dev_id, -EINVAL);
 
        token = strtok(NULL, ",");
-       if (token == NULL || strlen(token) == 0 || !isdigit(*token))
+       if (token == NULL || strlen(token) == 0 || !isdigit(*token)) {
+               free(l_params);
                return -1;
-
+       }
        /* Get Rx queue ID from parameter string */
        rx_queue_id = strtoul(token, NULL, 10);
        if (rx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_rx_queues) {
                RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", rx_queue_id);
+               free(l_params);
                return -EINVAL;
        }
 
@@ -3485,6 +3498,8 @@ handle_rxa_queue_stats_reset(const char *cmd __rte_unused,
        if (token != NULL)
                RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
                                 " telemetry command, ignoring");
+       /* Parsing parameter finished */
+       free(l_params);
 
        if (rte_event_eth_rx_adapter_queue_stats_reset(rx_adapter_id,
                                                       eth_dev_id,
-- 
2.25.1

Reply via email to