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 5764D45804 for ; Fri, 23 Aug 2024 18:20:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50D2C43379; Fri, 23 Aug 2024 18:20:53 +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 CD77F4336F for ; Fri, 23 Aug 2024 18:20:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430051; 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=84TlapGSMCOO134YQLbZBsFPaeYwCJxIszxJjUgwkDE=; b=AZq93whiVEznke10NEjdTJAXHGQGQhDfdZ9yPmDrpHjx+mELygL0UaOt97XrHDGWEtfM+2 jdRIVabViyaWWgblhKrvROgVSfhy7BKBdDkNhM1ZKEWi68sl+N+uXxq/eJQoYS0UaTahaj YvCeF8qP3GMjRv2Uu7Hl79P6TeHDcek= Received: from mx-prod-mc-03.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-353-2azcc-ehMAGJqPBaDRT-mA-1; Fri, 23 Aug 2024 12:20:50 -0400 X-MC-Unique: 2azcc-ehMAGJqPBaDRT-mA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27BCC19560AB; Fri, 23 Aug 2024 16:20:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0C661956053; Fri, 23 Aug 2024 16:20:47 +0000 (UTC) From: Kevin Traynor To: Conor Fogarty Cc: Vladimir Medvedkin , dpdk stable Subject: patch 'hash: check name when creating a hash' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:41 +0100 Message-ID: <20240823161929.1004778-33-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/8a77d04eb381a3096611f750700c776b6df88b18 Thanks. Kevin --- >From 8a77d04eb381a3096611f750700c776b6df88b18 Mon Sep 17 00:00:00 2001 From: Conor Fogarty Date: Thu, 6 Jul 2023 16:26:26 +0100 Subject: [PATCH] hash: check name when creating a hash [ upstream commit 8f36e53317ecf8384461e4f692e46beaaf6c4d2f ] Add NULL pointer check to params->name, which is later copied into the hash datastructure. Without this check the code segfaults on the strlcpy() of a NULL pointer. Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation") Signed-off-by: Conor Fogarty Acked-by: Vladimir Medvedkin --- lib/hash/rte_cuckoo_hash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 95c3e6c2f4..abe44cf677 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -173,4 +173,5 @@ rte_hash_create(const struct rte_hash_parameters *params) if ((params->entries > RTE_HASH_ENTRIES_MAX) || (params->entries < RTE_HASH_BUCKET_ENTRIES) || + (params->name == NULL) || (params->key_len == 0)) { rte_errno = EINVAL; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.944432841 +0100 +++ 0033-hash-check-name-when-creating-a-hash.patch 2024-08-23 17:18:09.668429924 +0100 @@ -1 +1 @@ -From 8f36e53317ecf8384461e4f692e46beaaf6c4d2f Mon Sep 17 00:00:00 2001 +From 8a77d04eb381a3096611f750700c776b6df88b18 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f36e53317ecf8384461e4f692e46beaaf6c4d2f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b31a3d973e..16c9c4c5c4 100644 +index 95c3e6c2f4..abe44cf677 100644 @@ -23 +24 @@ -@@ -174,4 +174,5 @@ rte_hash_create(const struct rte_hash_parameters *params) +@@ -173,4 +173,5 @@ rte_hash_create(const struct rte_hash_parameters *params)