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 0B2D146BAE for ; Fri, 18 Jul 2025 21:35:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 045E140E42; Fri, 18 Jul 2025 21:35:25 +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 25BF840B8F for ; Fri, 18 Jul 2025 21:35:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867323; 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=ROZrRBPdXG7MIa3hCS1MWaW57NqXtf0HeZ4lwFmXrSw=; b=czBhH3ri0labaZeyR3+70aeD1CWIBC1jvySAMTZEZP2LsuQkJlNKClqgjtBCmSb9ETX7EH HF8CwK8jzzcgymcFuia+9TAGg1avQPcPOmizeak46cjYD3Lvnd+fpiMDOV53VooFKpI+6U Ycna4WutFAymdyNjFTToF/sn8NkB8dI= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-FzCW8RqXPkql9xLvZ8GYUg-1; Fri, 18 Jul 2025 15:35:22 -0400 X-MC-Unique: FzCW8RqXPkql9xLvZ8GYUg-1 X-Mimecast-MFC-AGG-ID: FzCW8RqXPkql9xLvZ8GYUg_1752867321 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 482301956088; Fri, 18 Jul 2025 19:35:21 +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 B3A6B18003FC; Fri, 18 Jul 2025 19:35:19 +0000 (UTC) From: Kevin Traynor To: Satheesh Paul Cc: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix E-tag pattern parsing' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:04 +0100 Message-ID: <20250718193247.1008129-70-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: pj0qaZX7Vwmt39Qiv0caUSTRGOnWG2lPLrzgC5SOIZI_1752867321 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/71a46e1a8a9d7f45c979b456171c207b149733b4 Thanks. Kevin --- >From 71a46e1a8a9d7f45c979b456171c207b149733b4 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Thu, 22 May 2025 15:41:16 +0530 Subject: [PATCH] common/cnxk: fix E-tag pattern parsing [ upstream commit a610e32b96768b84436ba523bc97af88df4d6963 ] E-tag pattern parsing was using wrong length leading to a segfault. Fixing this by using the correct length of the pattern item. Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc.c | 5 +++-- drivers/common/cnxk/roc_npc_parse.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 53f278c764..9c7bd0e15c 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -940,8 +940,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], pst->mcam_mask = (uint8_t *)flow->mcam_mask; - while (pattern->type != ROC_NPC_ITEM_TYPE_END && - layer < PLT_DIM(parse_stage_funcs)) { + while (pattern->type != ROC_NPC_ITEM_TYPE_END && layer < PLT_DIM(parse_stage_funcs)) { /* Skip place-holders */ pattern = npc_parse_skip_void_and_any_items(pattern); + if (pattern->type == ROC_NPC_ITEM_TYPE_END) + break; pst->pattern = pattern; diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index 0aaf86c768..18ce71a5cc 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -530,4 +530,5 @@ npc_parse_lb(struct npc_parse_state *pst) lt = NPC_LT_LB_ETAG; lflags = 0; + info.len = pattern->size; last_pattern = pst->pattern; @@ -544,5 +545,4 @@ npc_parse_lb(struct npc_parse_state *pst) last_pattern = pattern; } - info.len = pattern->size; } else if (pst->pattern->type == ROC_NPC_ITEM_TYPE_QINQ) { info.hw_mask = NULL; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.480625823 +0100 +++ 0070-common-cnxk-fix-E-tag-pattern-parsing.patch 2025-07-18 20:29:10.969907450 +0100 @@ -1 +1 @@ -From a610e32b96768b84436ba523bc97af88df4d6963 Mon Sep 17 00:00:00 2001 +From 71a46e1a8a9d7f45c979b456171c207b149733b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a610e32b96768b84436ba523bc97af88df4d6963 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 1f2461e026..50106b8773 100644 +index 53f278c764..9c7bd0e15c 100644 @@ -24 +25 @@ -@@ -996,8 +996,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], +@@ -940,8 +940,9 @@ npc_parse_pattern(struct npc *npc, const struct roc_npc_item_info pattern[], @@ -37 +38 @@ -index b52024f434..37b43995db 100644 +index 0aaf86c768..18ce71a5cc 100644 @@ -40 +41 @@ -@@ -532,4 +532,5 @@ npc_parse_lb(struct npc_parse_state *pst) +@@ -530,4 +530,5 @@ npc_parse_lb(struct npc_parse_state *pst) @@ -46 +47 @@ -@@ -546,5 +547,4 @@ npc_parse_lb(struct npc_parse_state *pst) +@@ -544,5 +545,4 @@ npc_parse_lb(struct npc_parse_state *pst)