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 6CBA3A034F for ; Tue, 1 Mar 2022 11:45:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F84A426EA; Tue, 1 Mar 2022 11:45:01 +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 E4505426EA for ; Tue, 1 Mar 2022 11:44:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131499; 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=FeBVmZPQlNMCaj81jWVxd5eKQ/i4wG8Y1PCNIng5Sw0=; b=Vo9nvxOPXhl0DLWXdOVgHhxJTCneXEXb8D31YbzxD5G8wCdO6nqwGM78URX4P/HjKks7IG rNlr4Hxrhakfesv9VhQ0JTVs77bDfXzCwuQdYtCKEv5aTSj4NeX3czG99lXeUt5bYYIR9u e7KrUBYrUcESdPJNzFnruzWDrmuY1u8= 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-624-V-iRXpWAPYe0bm-sdJno0Q-1; Tue, 01 Mar 2022 05:44:56 -0500 X-MC-Unique: V-iRXpWAPYe0bm-sdJno0Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 294D4100C609; Tue, 1 Mar 2022 10:44:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D7546FB02; Tue, 1 Mar 2022 10:44:53 +0000 (UTC) From: Kevin Traynor To: Ankur Dwivedi Cc: Kiran Kumar K , dpdk stable Subject: patch 'common/cnxk: fix NPC key extraction validation' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:06 +0000 Message-Id: <20220301104300.334382-50-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Type: text/plain; charset=UTF-8 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 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 03/06/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/6a9b64907ede442468bf05e06f21ca7f1834ecaa Thanks. Kevin --- >From 6a9b64907ede442468bf05e06f21ca7f1834ecaa Mon Sep 17 00:00:00 2001 From: Ankur Dwivedi Date: Mon, 7 Feb 2022 11:42:46 +0530 Subject: [PATCH] common/cnxk: fix NPC key extraction validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 8540d7dbfcbe463c2ae988f92339a8486c5c0587 ] The x->len is passed as argument to npc_prep_mcam_ldata(). In the function, the len is used to reference elements of int_info and int_info_mask array. The arrays are of length NPC_MAX_EXTRACT_DATA_LEN. Validating the x->len value so that it is not greater than NPC_MAX_EXTRACT_DATA_LEN. This patch also resolves warning observed with gcc 12 compiler. log: ../drivers/common/cnxk/roc_npc_utils.c:13:26: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=] ptr[idx] = data[len - 1 - idx]; ../drivers/common/cnxk/roc_npc_utils.c:163:17: note: at offset 64 into destination object ‘int_info’ of size 64 uint8_t int_info[NPC_MAX_EXTRACT_DATA_LEN]; Bugzilla ID: 854 Fixes: 665b6a7400bf ("common/cnxk: add NPC helper API") Signed-off-by: Ankur Dwivedi Reviewed-by: Kiran Kumar K --- drivers/common/cnxk/roc_npc_utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/common/cnxk/roc_npc_utils.c b/drivers/common/cnxk/roc_npc_utils.c index 26e104c39f..f9768ea3cf 100644 --- a/drivers/common/cnxk/roc_npc_utils.c +++ b/drivers/common/cnxk/roc_npc_utils.c @@ -167,4 +167,7 @@ npc_update_extraction_data(struct npc_parse_state *pst, x = xinfo; + if (x->len > NPC_MAX_EXTRACT_DATA_LEN) + return NPC_ERR_INVALID_SIZE; + len = x->len; hdr_off = x->hdr_off; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.742747294 +0000 +++ 0050-common-cnxk-fix-NPC-key-extraction-validation.patch 2022-03-01 10:41:01.333244104 +0000 @@ -1 +1 @@ -From 8540d7dbfcbe463c2ae988f92339a8486c5c0587 Mon Sep 17 00:00:00 2001 +From 6a9b64907ede442468bf05e06f21ca7f1834ecaa Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 8540d7dbfcbe463c2ae988f92339a8486c5c0587 ] + @@ -30 +31,0 @@ -Cc: stable@dpdk.org