[PATCH v2 2/2] net/ice: fix memory leak in raw pattern parse

[Anatoly Burakov]

Currently, when parsing rte_flow raw type items, we allocate a bunch of
internal structures, but if errors happen down the line we just quit and
never free the memory we just allocated. Fix this by adding an error
cleanup section.

Fixes: 25be39cc1760 ("net/ice: enable protocol agnostic flow offloading in 
FDIR")
Cc: sta...@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com>
---

Notes:
    v2:
    - Removed the filter profile allocation error
      handling as it's now directly embedded in the
      filter structure and not allocated dynamically.

 drivers/net/intel/ice/ice_fdir_filter.c | 31 ++++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/drivers/net/intel/ice/ice_fdir_filter.c 
b/drivers/net/intel/ice/ice_fdir_filter.c
index d593624792..3090a5d13c 100644
--- a/drivers/net/intel/ice/ice_fdir_filter.c
+++ b/drivers/net/intel/ice/ice_fdir_filter.c
@@ -1865,7 +1865,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter 
*ad,
                        uint16_t tmp_val = 0;
                        uint16_t pkt_len = 0;
                        uint8_t tmp = 0;
-                       int i, j;
+                       int i, j, ret_val;
 
                        pkt_len = strlen((char *)(uintptr_t)raw_spec->pattern);
                        if (strlen((char *)(uintptr_t)raw_mask->pattern) !=
@@ -1920,19 +1920,27 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter 
*ad,
 
                        pkt_len /= 2;
 
-                       if (ice_parser_run(ad->psr, tmp_spec, pkt_len, &rslt))
-                               return -rte_errno;
+                       if (ice_parser_run(ad->psr, tmp_spec, pkt_len, &rslt)) {
+                               ret_val = -rte_errno;
+                               goto raw_error;
+                       }
 
-                       if (!tmp_mask)
-                               return -rte_errno;
+                       if (!tmp_mask) {
+                               ret_val = -rte_errno;
+                               goto raw_error;
+                       }
 
                        if (ice_parser_profile_init(&rslt, tmp_spec, tmp_mask,
-                               pkt_len, ICE_BLK_FD, true, &filter->prof))
-                               return -rte_errno;
+                               pkt_len, ICE_BLK_FD, true, &filter->prof)) {
+                               ret_val = -rte_errno;
+                               goto raw_error;
+                       }
 
                        u8 *pkt_buf = (u8 *)ice_malloc(&ad->hw, pkt_len + 1);
-                       if (!pkt_buf)
-                               return -ENOMEM;
+                       if (!pkt_buf) {
+                               ret_val = -ENOMEM;
+                               goto raw_error;
+                       }
                        rte_memcpy(pkt_buf, tmp_spec, pkt_len);
                        filter->pkt_buf = pkt_buf;
 
@@ -1943,6 +1951,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter 
*ad,
                        rte_free(tmp_spec);
                        rte_free(tmp_mask);
                        break;
+
+raw_error:
+                       rte_free(tmp_spec);
+                       rte_free(tmp_mask);
+                       return ret_val;
                }
 
                case RTE_FLOW_ITEM_TYPE_ETH:
-- 
2.47.3