From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4A7BA0093 for ; Tue, 19 May 2020 15:15:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC2681D94A; Tue, 19 May 2020 15:15:58 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 467701D94A for ; Tue, 19 May 2020 15:15:57 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id k13so13783715wrx.3 for ; Tue, 19 May 2020 06:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lt/X7wXFhPCRSzfOp+g/aD3kd1Kp5wbwN3rO2W7OaFs=; b=mpUWkGaynpl6JR865+27dKwRCL33NgCzDXhogxsdRlLBQNpilHhPJy9lvHSSQIKTSX CdHVKiSgSuhgjLbs4FgVxL8zQttaapO0xon3QM9opNaHPw25LOmM7hj7liFc2zmaJFb/ kNbRWp0O/+LamUK9dcXwVgHh0Img7Ay8PuXoo4kca319BFSKSjksS11KZNDbDtaTJudL MtBPnaLRphoaZjZHo2jLEoY7edN2qwiOqn6Wl2tKSGWeGC+7CQpCcIOw+EJsqCEuZ7UZ xbFptnFHSUtDo9LsY5V1pT02rTzQ5Wwlc0d+ZQL/XeKrpEPPCIFAmFcRXYDtDABWJ+kN 0aXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lt/X7wXFhPCRSzfOp+g/aD3kd1Kp5wbwN3rO2W7OaFs=; b=bjzzfy3fxkRw6VlV/2ZgQ87JRPV2huEgJDkGe69nwDR56VBGqXNi4/eOx2ZhWisSs9 r/v+r7BT8bi9mbiNKnvLRHQybWeNzLX9TNjWlwHDaZST6GXDJMlTkVYczAyLxdW3gqhb hEKj7CRvSRrsDCjtbiuBkFO+z5xWLU5Xj73gQ3ILTVhHye7b1lpcs06/vv54eErsho8a qfGvyVsIff0Z4G6SIfv8hC4VsSrPindommwtLzlYGx26i/ZnCIaYiiYI1bINItmQRSoV KJapQbHheCFOO//+tfvYgSnzQynctrP6q00tch4rUlm+3yMO6VmycUtxWsRTzQWY1+pM pfTg== X-Gm-Message-State: AOAM533aFjKcUNQ2KMYUy4KgMg4miMmJjZyywMqsvDam8ulAOSMHbc0U u4tPfY4/QgxmThClzM1IAKYJbf4VppCTwBWL X-Google-Smtp-Source: ABdhPJy2UDgdaIMHUBT7bx5D6Yq13S6cJwaA9elo5d6JahBjhQtvM6gA6vxNAnRMrLDf4PRZ8XNBAQ== X-Received: by 2002:a5d:694d:: with SMTP id r13mr24552198wrw.238.1589894156960; Tue, 19 May 2020 06:15:56 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z11sm19949186wrr.32.2020.05.19.06.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Junyu Jiang Cc: Qimai Xiao , Qiming Yang , dpdk stable Date: Tue, 19 May 2020 14:05:26 +0100 Message-Id: <20200519130549.112823-191-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix crash in switch filter' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 82e2269d013d7bd8af27f0982ab4a279b6edd020 Mon Sep 17 00:00:00 2001 From: Junyu Jiang Date: Wed, 6 May 2020 03:05:25 +0000 Subject: [PATCH] net/ice: fix crash in switch filter [ upstream commit 1f8672be4208e897e0d1004f43dadcac80749f68 ] The number of queues in queue group should be checked before using it. This patch fixed the issue. Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Junyu Jiang Tested-by: Qimai Xiao Acked-by: Qiming Yang --- drivers/net/ice/ice_switch_filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 1d91d773ec..202f29dab5 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -937,6 +937,8 @@ ice_switch_parse_action(struct ice_pf *pf, switch (action_type) { case RTE_FLOW_ACTION_TYPE_RSS: act_qgrop = action->conf; + if (act_qgrop->queue_num <= 1) + goto error; rule_info->sw_act.fltr_act = ICE_FWD_TO_QGRP; rule_info->sw_act.fwd_id.q_id = -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.356196987 +0100 +++ 0191-net-ice-fix-crash-in-switch-filter.patch 2020-05-19 14:04:44.544654318 +0100 @@ -1,13 +1,14 @@ -From 1f8672be4208e897e0d1004f43dadcac80749f68 Mon Sep 17 00:00:00 2001 +From 82e2269d013d7bd8af27f0982ab4a279b6edd020 Mon Sep 17 00:00:00 2001 From: Junyu Jiang Date: Wed, 6 May 2020 03:05:25 +0000 Subject: [PATCH] net/ice: fix crash in switch filter +[ upstream commit 1f8672be4208e897e0d1004f43dadcac80749f68 ] + The number of queues in queue group should be checked before using it. This patch fixed the issue. Fixes: 47d460d63233 ("net/ice: rework switch filter") -Cc: stable@dpdk.org Signed-off-by: Junyu Jiang Tested-by: Qimai Xiao @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c -index 72bb22395b..1bea7e807c 100644 +index 1d91d773ec..202f29dab5 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c -@@ -1297,6 +1297,8 @@ ice_switch_parse_action(struct ice_pf *pf, +@@ -937,6 +937,8 @@ ice_switch_parse_action(struct ice_pf *pf, switch (action_type) { case RTE_FLOW_ACTION_TYPE_RSS: act_qgrop = action->conf;