]> git.droids-corp.org - dpdk.git/commitdiff
net/sfc: validate queue span when parsing flow action RSS
authorIvan Malov <ivan.malov@oktetlabs.ru>
Mon, 10 Jan 2022 21:48:45 +0000 (00:48 +0300)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 25 Jan 2022 11:26:48 +0000 (12:26 +0100)
The current code silently shrinks the value if it exceeds
the supported maximum. Do not do that. Validate the value.

Fixes: d77d07391d4d ("net/sfc: support flow API RSS action")
Cc: stable@dpdk.org
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
drivers/net/sfc/sfc_flow.c

index fc74c8035e45a67cf68b020a4a84ffa7f0b86745..509fde4a868e56cc62e68397d53e42b861395c5d 100644 (file)
@@ -1477,6 +1477,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:
@@ -1612,9 +1615,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa,
                uint8_t *rss_key;
 
                if (spec_filter->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 {