dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1 1/1] net/ice: fix memory leak in raw pattern parse
@ 2025-10-07 11:37 Anatoly Burakov
  2025-10-07 12:42 ` [PATCH v2 1/2] net/ice: remove indirection for FDIR filters Anatoly Burakov
  0 siblings, 1 reply; 4+ messages in thread
From: Anatoly Burakov @ 2025-10-07 11:37 UTC (permalink / raw)
  To: dev, Bruce Richardson, Qi Zhang, Junfeng Guo; +Cc: vladimir.medvedkin, stable

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: stable@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/net/intel/ice/ice_fdir_filter.c | 40 ++++++++++++++++++-------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c
index d41d223d52..7aa8fc3994 100644
--- a/drivers/net/intel/ice/ice_fdir_filter.c
+++ b/drivers/net/intel/ice/ice_fdir_filter.c
@@ -1867,7 +1867,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) !=
@@ -1922,24 +1922,34 @@ 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;
+			}
 
 			filter->prof = (struct ice_parser_profile *)
 				ice_malloc(&ad->hw, sizeof(*filter->prof));
-			if (!filter->prof)
-				return -ENOMEM;
+			if (!filter->prof) {
+				ret_val = -ENOMEM;
+				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_prof;
+			}
 
 			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_prof;
+			}
 			rte_memcpy(pkt_buf, tmp_spec, pkt_len);
 			filter->pkt_buf = pkt_buf;
 
@@ -1950,6 +1960,14 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
 			rte_free(tmp_spec);
 			rte_free(tmp_mask);
 			break;
+
+raw_error_prof:
+			rte_free(filter->prof);
+			filter->prof = NULL;
+raw_error:
+			rte_free(tmp_spec);
+			rte_free(tmp_mask);
+			return ret_val;
 		}
 
 		case RTE_FLOW_ITEM_TYPE_ETH:
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-07 15:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-07 11:37 [PATCH v1 1/1] net/ice: fix memory leak in raw pattern parse Anatoly Burakov
2025-10-07 12:42 ` [PATCH v2 1/2] net/ice: remove indirection for FDIR filters Anatoly Burakov
2025-10-07 12:42   ` [PATCH v2 2/2] net/ice: fix memory leak in raw pattern parse Anatoly Burakov
2025-10-07 15:22     ` Burakov, Anatoly

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).