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 8B7DDA034C for ; Fri, 25 Feb 2022 18:16:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82BE64114D; Fri, 25 Feb 2022 18:16:45 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 49E2B4114D for ; Fri, 25 Feb 2022 18:16:44 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 24A9040017 for ; Fri, 25 Feb 2022 17:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809404; bh=jGA8ExpWXmOEYtpb81uBpGRn8DKNy3LA2U0PI2hsz60=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HtKt4cCPkA/bGpSzvOtP5p5fCJ/vnvGs20KqMctq62mkV0XIEPpZqlYXzuMrS5bOm 1E96IY3rQnRgET8DDB9xU6pOGzBGJrGdlpqk6WNnSGa6edGPo0eFpsRQ51/D3L7XS1 jg2Zz0ip8X9rvfjMGGO3R/V50Hypoa36UWy485oMFB1603WlTs3/NcpsujPMQMEU19 c+o+67Fb5Q4nzAArzeAtCVkgVUIJlbiqrMYB04/ybApp4pbIQdmZrnFF+WqLaFJJYK IRacm01H1gJllGmZydtcFE8FwkTOd3rQ/etrGQubM5WOtlRKZCpvLL8e96OBYB/Evy a9Ba94Q987LjQ== Received: by mail-wm1-f69.google.com with SMTP id w3-20020a7bc743000000b0037c5168b3c4so1832196wmk.7 for ; Fri, 25 Feb 2022 09:16:44 -0800 (PST) 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=jGA8ExpWXmOEYtpb81uBpGRn8DKNy3LA2U0PI2hsz60=; b=pTurDvyKk1QA8ZuCovClgkOgVgCvQq8eei8gUpRiAf3Wo9tzy8Gs8Km6OizZ0GZ0i8 zpzTCeACVKCbSv2v+Kwo7AJUivOjrw/I9Tyxearro1rQGDBc9ppon6Yvc24qFdwmnUBS oahXW0RNnPjT+zFRCIvew0dmuQxrzOgYCufW8uKernijHIEWDyQ471tbjx7begIzT8Nm Q2u09VznPbxotprT5wsPmGpntsdYooyKT1GTYCUney1y7sE5JeyVR6+Ijo8y7u6HfdW6 o+3FRvjUERLkg8NSBbx3GLeP2Yu70P0kPg8+g+j/6d9xtta3Q5slmt5p95Tmls184lKi P71Q== X-Gm-Message-State: AOAM530wVmubbLNjd9EVjheXQGbrEjI6rlUAlnACSVcVo3DjPA7J7wHh Br/dWVA32YLoSkm8KFSjD6rOgVzjqts9zIo2cFaOYvW/PgXWfZI0EMCldFlDAcEAhonL4uDk+OI 72LdMX4gP7YZOlekc6NIcLYQ3 X-Received: by 2002:a05:6000:1ac8:b0:1e8:4a0c:d260 with SMTP id i8-20020a0560001ac800b001e84a0cd260mr6748359wry.294.1645809403458; Fri, 25 Feb 2022 09:16:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5zgGYzi/QzdFupNuKrX842Fa3qU5sm3xeJr5oMBfTgy1rx0vaN80jQusohmXjQ5fmJyPR8A== X-Received: by 2002:a05:6000:1ac8:b0:1e8:4a0c:d260 with SMTP id i8-20020a0560001ac800b001e84a0cd260mr6748348wry.294.1645809403259; Fri, 25 Feb 2022 09:16:43 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c154c00b0037df2e5d8c9sm3533984wmg.27.2022.02.25.09.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:42 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Fri, 25 Feb 2022 18:15:11 +0100 Message-Id: <20220225171550.3499040-18-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/177049c3d18f97f68d8c58eaabf4594be59468c9 Thanks. Christian Ehrhardt --- >From 177049c3d18f97f68d8c58eaabf4594be59468c9 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 91aa2a687a..c8ff0ff2a6 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -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: @@ -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 { -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.994639770 +0100 +++ 0018-net-sfc-validate-queue-span-when-parsing-flow-action.patch 2022-02-25 16:58:44.220990396 +0100 @@ -1 +1 @@ -From 667151aec1ddf8669819ac39d3e86f40f815c213 Mon Sep 17 00:00:00 2001 +From 177049c3d18f97f68d8c58eaabf4594be59468c9 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 91aa2a687a..c8ff0ff2a6 100644 @@ -22 +23 @@ -@@ -1477,6 +1477,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, +@@ -1294,6 +1294,9 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, @@ -32 +33 @@ -@@ -1612,9 +1615,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, +@@ -1423,9 +1426,8 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, @@ -35 +36 @@ - if (spec_filter->rss) { + if (flow->rss) {