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 521BCA0093 for ; Tue, 10 May 2022 14:30:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D4454069D; Tue, 10 May 2022 14:30:50 +0200 (CEST) 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 3A18242837 for ; Tue, 10 May 2022 14:30:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185847; 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=SxIheds/SzT3EPuI4YpLoqNuiOb0UoWrqvs0HLObuD0=; b=FkxVpu76X+pKnxaOtmqEkdSV02leSrNjPbQTOFBsp8nvS3CRl2O3A2+QA+WyZMjeoL38sH U3P7WvAvjAPGEHaOaKejRgmEMHx4tdbk5H8FRmEmPScj4bOomVPtcPj46MGIo6/dMgyrVf qnLXuMJFa/2s21ql6bivhzTW/2VT7Cg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-FqIW_NhBOMmntel-wFbLGw-1; Tue, 10 May 2022 08:30:44 -0400 X-MC-Unique: FqIW_NhBOMmntel-wFbLGw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 72CA729ABA2E; Tue, 10 May 2022 12:30:44 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id B00BB40CFD06; Tue, 10 May 2022 12:30:43 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: Cristian Dumitrescu , dpdk stable Subject: patch 'test/table: fix buffer overflow on lpm entry' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:55 +0100 Message-Id: <20220510123010.159523-18-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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-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.2 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/15/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/65855b2d37a2f4821a0faad4c08711eaf35160bd Thanks. Kevin --- >From 65855b2d37a2f4821a0faad4c08711eaf35160bd Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Thu, 21 Apr 2022 17:35:27 +0000 Subject: [PATCH] test/table: fix buffer overflow on lpm entry [ upstream commit a6699a6eb22a763ad4bc7498ca53cf89ab9917dd ] This patch fixes stack buffer overflow reported by ASan. Bugzilla ID: 820 Fixes: 5205954791cb ("app/test: packet framework unit tests") Signed-off-by: Vladimir Medvedkin Acked-by: Cristian Dumitrescu --- app/test/test_table_tables.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c index 4ff6ab16aa..494fb6ffaa 100644 --- a/app/test/test_table_tables.c +++ b/app/test/test_table_tables.c @@ -291,8 +291,8 @@ test_table_lpm(void) void *table; char *entries[RTE_PORT_IN_BURST_SIZE_MAX]; - char entry; + uint64_t entry; void *entry_ptr; int key_found; - uint32_t entry_size = 1; + uint32_t entry_size = sizeof(entry); /* Initialize params and create tables */ @@ -356,5 +356,5 @@ test_table_lpm(void) lpm_key.ip = 0xadadadad; - table = rte_table_lpm_ops.f_create(&lpm_params, 0, 1); + table = rte_table_lpm_ops.f_create(&lpm_params, 0, entry_size); if (table == NULL) return -9; @@ -457,8 +457,8 @@ test_table_lpm_ipv6(void) void *table; char *entries[RTE_PORT_IN_BURST_SIZE_MAX]; - char entry; + uint64_t entry; void *entry_ptr; int key_found; - uint32_t entry_size = 1; + uint32_t entry_size = sizeof(entry); /* Initialize params and create tables */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.105519909 +0100 +++ 0018-test-table-fix-buffer-overflow-on-lpm-entry.patch 2022-05-10 13:24:21.608646366 +0100 @@ -1 +1 @@ -From a6699a6eb22a763ad4bc7498ca53cf89ab9917dd Mon Sep 17 00:00:00 2001 +From 65855b2d37a2f4821a0faad4c08711eaf35160bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a6699a6eb22a763ad4bc7498ca53cf89ab9917dd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d5c5a426bc..010dd5a794 100644 +index 4ff6ab16aa..494fb6ffaa 100644 @@ -22 +23 @@ -@@ -293,8 +293,8 @@ test_table_lpm(void) +@@ -291,8 +291,8 @@ test_table_lpm(void) @@ -33 +34 @@ -@@ -358,5 +358,5 @@ test_table_lpm(void) +@@ -356,5 +356,5 @@ test_table_lpm(void) @@ -40 +41 @@ -@@ -459,8 +459,8 @@ test_table_lpm_ipv6(void) +@@ -457,8 +457,8 @@ test_table_lpm_ipv6(void)