Skip to content

Commit

Permalink
net/sfc: validate queue span when parsing flow action RSS
Browse files Browse the repository at this point in the history
[ upstream commit 667151aec1ddf8669819ac39d3e86f40f815c213 ]

The current code silently shrinks the value if it exceeds
the supported maximum. Do not do that. Validate the value.

Fixes: d77d073 ("net/sfc: support flow API RSS action")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
  • Loading branch information
ol-ivanmal authored and cpaelzer committed Feb 25, 2022
1 parent 6f93f17 commit 177049c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/sfc/sfc_flow.c
Expand Up @@ -1294,6 +1294,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,
rxq_hw_index_max = rxq->hw_index;
}

if (rxq_hw_index_max - rxq_hw_index_min + 1 > EFX_MAXRSS)
return -EINVAL;

switch (action_rss->func) {
case RTE_ETH_HASH_FUNCTION_DEFAULT:
case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
Expand Down Expand Up @@ -1423,9 +1426,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa,
uint8_t *rss_key;

if (flow->rss) {
rss_spread = MIN(flow_rss->rxq_hw_index_max -
flow_rss->rxq_hw_index_min + 1,
EFX_MAXRSS);
rss_spread = flow_rss->rxq_hw_index_max -
flow_rss->rxq_hw_index_min + 1;
rss_hash_types = flow_rss->rss_hash_types;
rss_key = flow_rss->rss_key;
} else {
Expand Down

0 comments on commit 177049c

Please sign in to comment.