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 EDC7DA00C2 for ; Tue, 8 Mar 2022 15:16:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E93F8406B4; Tue, 8 Mar 2022 15:16:29 +0100 (CET) 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 6DCAC4068E for ; Tue, 8 Mar 2022 15:16:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748988; 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=EbeOF1ug4O6EKhHqiu+YwXO/KdnvpikUia+cJsjG9CU=; b=XQvZDYteW5ZQ5hFDz8TZlBIRFQlF6l3+7EnvdAhhCusjukcvcasFpXfHHqW7TcHVQgFPEL rD8c6efF7DTOAZjxBnmtGzhb8YhLJ2b30C345u98z4c8bkLCUUms0GXMltAZZeBBH9s0CM 9t/E2ZPQh/nqZZwE6RWKcfi3ouvIQvQ= 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-359-6GhB-mslOpOaBKLPQaewZg-1; Tue, 08 Mar 2022 09:16:25 -0500 X-MC-Unique: 6GhB-mslOpOaBKLPQaewZg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 413815200; Tue, 8 Mar 2022 14:16:24 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DC7D865A4; Tue, 8 Mar 2022 14:16:22 +0000 (UTC) From: Kevin Traynor To: Reshma Pattan Cc: Stephen Hemminger , dpdk stable Subject: patch 'app/pdump: abort on multi-core capture limit' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:55 +0000 Message-Id: <20220308141500.286915-40-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-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/14/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/8dc074672f2c05704dfd06614761b23d7cf4bd6d Thanks. Kevin --- >From 8dc074672f2c05704dfd06614761b23d7cf4bd6d Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Mon, 28 Feb 2022 09:58:56 +0000 Subject: [PATCH] app/pdump: abort on multi-core capture limit [ upstream commit 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c ] Check lcore id value is not the maximum core supported. Using lcore id without this check might cause out of bound access inside the rte_eal_wait_lcore. Coverity issue: 375841 Fixes: b2854d5317e8 ("app/pdump: support multi-core capture") Signed-off-by: Reshma Pattan Acked-by: Stephen Hemminger --- app/pdump/main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index 46f9d25db0..101ac7db9a 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -904,9 +904,19 @@ dump_packets_core(void *arg) } +static unsigned int +get_next_core(unsigned int lcore) +{ + lcore = rte_get_next_lcore(lcore, 1, 0); + if (lcore == RTE_MAX_LCORE) + rte_exit(EXIT_FAILURE, + "Max core limit %u reached for packet capture", lcore); + return lcore; +} + static inline void dump_packets(void) { int i; - uint32_t lcore_id = 0; + unsigned int lcore_id = 0; if (!multiple_core_capture) { @@ -934,10 +944,10 @@ dump_packets(void) } - lcore_id = rte_get_next_lcore(lcore_id, 1, 0); + lcore_id = get_next_core(lcore_id); for (i = 0; i < num_tuples; i++) { rte_eal_remote_launch(dump_packets_core, &pdump_t[i], lcore_id); - lcore_id = rte_get_next_lcore(lcore_id, 1, 0); + lcore_id = get_next_core(lcore_id); if (rte_eal_wait_lcore(lcore_id) < 0) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.368067260 +0000 +++ 0040-app-pdump-abort-on-multi-core-capture-limit.patch 2022-03-08 13:55:28.511315205 +0000 @@ -1 +1 @@ -From 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c Mon Sep 17 00:00:00 2001 +From 8dc074672f2c05704dfd06614761b23d7cf4bd6d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3ee04ebc91f3872c4c1d9f9911f0cdfa32377d8c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 04a38e8911..96fa76f8da 100644 +index 46f9d25db0..101ac7db9a 100644 @@ -24 +25 @@ -@@ -901,9 +901,19 @@ dump_packets_core(void *arg) +@@ -904,9 +904,19 @@ dump_packets_core(void *arg) @@ -45 +46 @@ -@@ -931,10 +941,10 @@ dump_packets(void) +@@ -934,10 +944,10 @@ dump_packets(void)