[dpdk-dev] [dpdk-dev v1] net/ice: fix invalid hash validation

[dpdk-dev] [dpdk-dev v1] net/ice: fix invalid hash validation

[Jeff Guo]

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

Signed-off-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/ice/ice_hash.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 2845ca0bd..fdfaff7f6 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -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 ||
-- 
2.20.1

Re: [dpdk-dev] [dpdk-dev v1] net/ice: fix invalid hash validation

[Zhang, Qi Z]

> -----Original Message-----
> From: Guo, Jia <jia.guo@intel.com>
> Sent: Monday, July 27, 2020 3:59 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Su, Simei <simei.su@intel.com>; Guo, Jia
> <jia.guo@intel.com>
> Subject: [dpdk-dev v1] 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.
> 
> Signed-off-by: Jeff Guo <jia.guo@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel with below fix line
Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")

Thanks
Qi