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 9BA51A0350 for ; Mon, 21 Feb 2022 16:39:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96B674013F; Mon, 21 Feb 2022 16:39:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 58FE34013F for ; Mon, 21 Feb 2022 16:39:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=trlJnAgPohEk1Yip+iHCKCwfMmUxhOLV0PWIl7hH91M=; b=Vea6H+yzFo/vvMAvnfQkw+CW/68EykzXdwgy6AHe8LxjtjVqJHGhVa6ACX+oBJD631t4KI +2tj3wuAz6p9gHvGbQWLE0F1T7XHTWr0wwPcXomFZjdRQVZynI4rXgXICbKg7I+zRLVhzx 5EnHWIyv3DCThBmKo0gBFFCGBfLBNFU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-134-pa_G2IWtNCWfv7ZShVS1Fw-1; Mon, 21 Feb 2022 10:39:27 -0500 X-MC-Unique: pa_G2IWtNCWfv7ZShVS1Fw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 162D5100C662; Mon, 21 Feb 2022 15:39:26 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A8967E133; Mon, 21 Feb 2022 15:39:24 +0000 (UTC) From: Kevin Traynor 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 21.11.1 Date: Mon, 21 Feb 2022 15:34:39 +0000 Message-Id: <20220221153625.152324-90-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4599a6179ab28eaa44e6a53b48463b6535f71be5 Thanks. Kevin --- >From 4599a6179ab28eaa44e6a53b48463b6535f71be5 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 fc74c8035e..509fde4a86 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -1478,4 +1478,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa, } + if (rxq_hw_index_max - rxq_hw_index_min + 1 > EFX_MAXRSS) + return -EINVAL; + switch (action_rss->func) { case RTE_ETH_HASH_FUNCTION_DEFAULT: @@ -1613,7 +1616,6 @@ sfc_flow_filter_insert(struct sfc_adapter *sa, 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; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.576949033 +0000 +++ 0090-net-sfc-validate-queue-span-when-parsing-flow-action.patch 2022-02-21 15:22:44.185704337 +0000 @@ -1 +1 @@ -From 667151aec1ddf8669819ac39d3e86f40f815c213 Mon Sep 17 00:00:00 2001 +From 4599a6179ab28eaa44e6a53b48463b6535f71be5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 667151aec1ddf8669819ac39d3e86f40f815c213 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org