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 8166046BAE for ; Fri, 18 Jul 2025 21:34:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C09F40611; Fri, 18 Jul 2025 21:34:02 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0A64940B8F for ; Fri, 18 Jul 2025 21:34:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867240; 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=mhWMfAXUXG6b3tQZWSKGQfhjMQKKDnRiJQAnak0kFTY=; b=i34t0w4FksukhXJ3wJeoVQAPyPRcg/MsxHdaNHolIUKrq8izh1Rd9vyKnRN/qEkkfmXopr m7IB6m4H2jbkNUyJJRkIz3OP8mXEWap10vt3zmTYrtW0coMV9UB7BF3X4amVUOG1EUkCCE quDUEK74FxgW6EmLBeG2U6FaBla0dtE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-597-lLTR9uzeNaSmdGCCP4sGhg-1; Fri, 18 Jul 2025 15:33:57 -0400 X-MC-Unique: lLTR9uzeNaSmdGCCP4sGhg-1 X-Mimecast-MFC-AGG-ID: lLTR9uzeNaSmdGCCP4sGhg_1752867236 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7CEDB1800283; Fri, 18 Jul 2025 19:33:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0C3B2180049D; Fri, 18 Jul 2025 19:33:54 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix GRE flow item validation' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:23 +0100 Message-ID: <20250718193247.1008129-29-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yeLtf_zQe1mAHjYqQnVCkhFmj811yXJ4sKZvS34x2zc_1752867236 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 07/23/25. 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/eef73c95b14ecd8e011858a734ff89440f0ad91d Thanks. Kevin --- >From eef73c95b14ecd8e011858a734ff89440f0ad91d Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Sun, 27 Apr 2025 14:22:57 +0300 Subject: [PATCH] net/mlx5: fix GRE flow item validation [ upstream commit 41e1fac36acf0af9817f158a5ab4f4719cd6af4a ] GRE item was dereferenced w/o checking it's value. Added a check to verify if null before using the pointer. Fixes: 80c676259a04 ("net/mlx5: validate HWS template items") Signed-off-by: Maayan Kashani Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e909a6ab63..61833c0dcb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3334,8 +3334,8 @@ mlx5_flow_validate_item_gre_key(const struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ITEM, item, "GRE key following a wrong item"); - gre_mask = gre_item->mask; + gre_mask = gre_item ? gre_item->mask : NULL; if (!gre_mask) gre_mask = &rte_flow_item_gre_mask; - gre_spec = gre_item->spec; + gre_spec = gre_item ? gre_item->spec : NULL; if (gre_spec && (gre_mask->c_rsvd0_ver & RTE_BE16(0x2000)) && !(gre_spec->c_rsvd0_ver & RTE_BE16(0x2000))) @@ -3380,6 +3380,6 @@ mlx5_flow_validate_item_gre_option(struct rte_eth_dev *dev, struct rte_flow_error *error) { - const struct rte_flow_item_gre *gre_spec = gre_item->spec; - const struct rte_flow_item_gre *gre_mask = gre_item->mask; + const struct rte_flow_item_gre *gre_spec = gre_item ? gre_item->spec : NULL; + const struct rte_flow_item_gre *gre_mask = gre_item ? gre_item->mask : NULL; const struct rte_flow_item_gre_opt *spec = item->spec; const struct rte_flow_item_gre_opt *mask = item->mask; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.104887710 +0100 +++ 0029-net-mlx5-fix-GRE-flow-item-validation.patch 2025-07-18 20:29:10.866907135 +0100 @@ -1 +1 @@ -From 41e1fac36acf0af9817f158a5ab4f4719cd6af4a Mon Sep 17 00:00:00 2001 +From eef73c95b14ecd8e011858a734ff89440f0ad91d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 41e1fac36acf0af9817f158a5ab4f4719cd6af4a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cb91f4dfbe..8696cc4e95 100644 +index e909a6ab63..61833c0dcb 100644 @@ -22 +23 @@ -@@ -3335,8 +3335,8 @@ mlx5_flow_validate_item_gre_key(const struct rte_eth_dev *dev, +@@ -3334,8 +3334,8 @@ mlx5_flow_validate_item_gre_key(const struct rte_eth_dev *dev, @@ -33 +34 @@ -@@ -3381,6 +3381,6 @@ mlx5_flow_validate_item_gre_option(struct rte_eth_dev *dev, +@@ -3380,6 +3380,6 @@ mlx5_flow_validate_item_gre_option(struct rte_eth_dev *dev,