From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9D25A0032 for ; Fri, 18 Feb 2022 13:42:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0F8E40141; Fri, 18 Feb 2022 13:42:04 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id C022140E2D for ; Fri, 18 Feb 2022 13:42:03 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id d14-20020a05600c34ce00b0037bf4d14dc7so6310448wmq.3 for ; Fri, 18 Feb 2022 04:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4VTPoN4Dg6ADiz+XM9pdcm2rfApT0LF/FOdpNejF8Hw=; b=X2xL54cVfe0wFbVnxzhH2JNlO61qUbNQ+cwhc5dGe/+oC8J6qJW+ug+OgUTdLo+bm/ D9PjwP9JGqMSvPCU2XHDpSk4fQUm2yzd/BnJ6YH54IaQEoj+s+I8CG9b5qwWiydPnLau vuZoHl+47QQLE3KTThTvO0gm/RThuUvLJSjB9+bamztfFiMkN4NqBIzkGCOHgIqH+IoP cBpH6SBJPD6B9rCLIkhZPa6j0T3kb/hP4Dlh2kiLsjnF2l669ukYgmyFodogIbJ9c8nz bQqLR/crgOPVdhk7pP4qK+hOxu62qOQG/aoZLYXdhxNOwprkSKQ6RqHPB91BagD5ahNA QW3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4VTPoN4Dg6ADiz+XM9pdcm2rfApT0LF/FOdpNejF8Hw=; b=bm7sUcJd15H7bE13R5iVKgbLwEphPddwKlb+QI6r4jMaRNMMuFr8spab4OC+5K8PFm jyGNrHexhaQP1OlZY2RzMaJHasBvmKo91y+9keUE1DLKxFbAvwR74bOXHsBTiE+fsrQI G8slwIib8K7HZ5EnvSoTjONil83r28JYXI+TAg8nt1B5yrU9zj4etRN/ui0HIelFVThm CASLtqf+YF8Mr55zjy1N6+22F5rcloWlzct61h+kEM1bDDPyWUdkZZZQZu2Z/9x6JTCS vQzIOEN/DPkobR8xaFR6xGWElDxs6IK22XzZAuzutwwfFR+70OdURLUaPlxJbSgs0Ij0 GG7w== X-Gm-Message-State: AOAM532/sr1wKT+mc59uyfRExjCROvSowBe+rjCw51fWncWWI6WByoeN ES5HwX4Ah/4bGa8cXWwPpOBknqaCT/h0AYTm X-Google-Smtp-Source: ABdhPJxItG901wVKzYAzXGxw/6TUaQrz/36EUbR40EdEsj2pIYraRaOPP5NCyJsdHcxPKzhaDYSTlA== X-Received: by 2002:a1c:c907:0:b0:37b:f983:5d4e with SMTP id f7-20020a1cc907000000b0037bf9835d4emr6988415wmb.174.1645188123498; Fri, 18 Feb 2022 04:42:03 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id p2sm4212349wmc.33.2022.02.18.04.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:03 -0800 (PST) From: luca.boccassi@gmail.com To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: validate queue span when parsing flow action RSS' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:17 +0000 Message-Id: <20220218123931.1749595-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ff474dde7be5daddb43e9bc53f03919b7ed094d8 Thanks. Luca Boccassi --- >From ff474dde7be5daddb43e9bc53f03919b7ed094d8 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Tue, 11 Jan 2022 00:48:45 +0300 Subject: [PATCH] net/sfc: validate queue span when parsing flow action RSS [ upstream commit 667151aec1ddf8669819ac39d3e86f40f815c213 ] 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") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc_flow.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 4321045d1a..95d1d7cd78 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -1382,6 +1382,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: @@ -1516,9 +1519,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 { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.908166669 +0000 +++ 0048-net-sfc-validate-queue-span-when-parsing-flow-action.patch 2022-02-18 12:37:37.662791295 +0000 @@ -1 +1 @@ -From 667151aec1ddf8669819ac39d3e86f40f815c213 Mon Sep 17 00:00:00 2001 +From ff474dde7be5daddb43e9bc53f03919b7ed094d8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 667151aec1ddf8669819ac39d3e86f40f815c213 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index fc74c8035e..509fde4a86 100644 +index 4321045d1a..95d1d7cd78 100644 @@ -22 +23 @@ -@@ -1477,6 +1477,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, +@@ -1382,6 +1382,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, @@ -32 +33 @@ -@@ -1612,9 +1615,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, +@@ -1516,9 +1519,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa,