From: Jeff Guo Date: Mon, 27 Jul 2020 07:58:31 +0000 (+0800) Subject: net/ice: fix hash action validation X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=71fa6a99643d167df38605d53c3573a435107d01;p=dpdk.git net/ice: fix hash action validation An invalid rule should not be validated successfully. If the rule is not in the supporting list, just return failure to application. Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS") Cc: stable@dpdk.org Signed-off-by: Jeff Guo Acked-by: Qi Zhang --- diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index 2845ca0bde..fdfaff7f65 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 ||