Skip to contentSkip to conversation

net/ice: fix invalid hash validation

PATCH Applied Jeff Guo 2 participants 2 messages Jul 27, 2020 Network drivers

lore
Share & tools
lore

Jeff Guo

author
#0 lore raw

PATCH 1/1 net/ice: fix invalid hash validation

An invalid rule should not be validated successfully. If the rule is not in the supporting list, just return failure to application.

---
 drivers/net/ice/ice_hash.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/net/ice/ice_hash.c +9 -0
index 2845ca0bd..fdfaff7f6 100644
@@ -1012,6 +1012,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 	enum rte_flow_action_type action_type;
 	const struct rte_flow_action_rss *rss;
 	const struct rte_flow_action *action;
+	bool hash_map_found = false;
 	uint64_t rss_attr_src_dst;
 	uint64_t rss_attr_l3_pre;
 	uint64_t rss_attr_symm;
@@ -1125,10 +1126,18 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 				if (rss_type == ht_map->hash_type) {
 					hash_meta->hash_flds =
 							ht_map->hash_flds;
+					hash_map_found = true;
 					break;
 				}
 			}
 
+			if (pattern_match_item->pattern_list !=
+			    pattern_empty && !hash_map_found) {
+				return rte_flow_error_set(error, ENOTSUP,
+					RTE_FLOW_ERROR_TYPE_ACTION, action,
+					"Not supported flow");
+			}
+
 			/* update hash field for nat-t esp. */
 			if (rss_type == ETH_RSS_ESP &&
 			    (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
Signature · 1 line
2.20.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Monday, July 27, 2020 3:59 PM
To: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Cc: [email protected]; Su, Simei <[email protected]>; Guo, Jia <[email protected]>
Subject: [dpdk-dev v1] net/ice: fix invalid hash validation

Quoted 4 lines

An invalid rule should not be validated successfully. If the rule is not in the supporting list, just return failure to application.

Applied to dpdk-next-net-intel with below fix line

Fixes 5ad3db8d4bdd ("net/ice: enable advanced RSS")

Thanks
Qi