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 64EBE43829 for ; Tue, 5 Mar 2024 16:35:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57CFB42DE1; Tue, 5 Mar 2024 16:35:24 +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 6500D410FB for ; Tue, 5 Mar 2024 16:35:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652922; 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=sVwO9VZKR5LhiJa+L2H8zIYBJ/9Y6NrZBqYDtpYC61w=; b=H+xkFNxiuoA6TwK9WG3lOYzm1JzMwgyVfW/lh/Z0vWBh9izIrthVJlS61vOp89oR8vlR5P bT2t7kaGpudSTrF6VqhTVMbH5269a8lM5vz5x25zVUCO8pwsnE2qUFaaXvesfQM1Inp/6+ dmGL8kdh+QDHCARV+9BCK/MpzP+Hc8I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-178-BgOzUzfGPEeZdpuQy6fzIg-1; Tue, 05 Mar 2024 10:35:21 -0500 X-MC-Unique: BgOzUzfGPEeZdpuQy6fzIg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 523B98007A4; Tue, 5 Mar 2024 15:35:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id A79BB200AFA2; Tue, 5 Mar 2024 15:35:20 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'app/dumpcap: verify strdup return' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:51 +0000 Message-ID: <20240305153449.263666-18-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 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/11/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/59b5633558a0ce472d328a69f4dda1c3084d5765 Thanks. Kevin --- >From 59b5633558a0ce472d328a69f4dda1c3084d5765 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:10 +0000 Subject: [PATCH] app/dumpcap: verify strdup return [ upstream commit 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab ] Add verify strdup return value logic. Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application") Signed-off-by: Chengwen Feng --- app/dumpcap/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 74dd72b3ac..44576bed42 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -528,4 +528,9 @@ static void dpdk_init(void) eal_argv[i] = strdup(args[i]); + for (i = 0; i < (unsigned int)eal_argc; i++) { + if (eal_argv[i] == NULL) + rte_panic("No memory\n"); + } + if (rte_eal_init(eal_argc, eal_argv) < 0) rte_exit(EXIT_FAILURE, "EAL init failed: is primary process running?\n"); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.145524824 +0000 +++ 0018-app-dumpcap-verify-strdup-return.patch 2024-03-05 14:08:54.627520704 +0000 @@ -1 +1 @@ -From 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab Mon Sep 17 00:00:00 2001 +From 59b5633558a0ce472d328a69f4dda1c3084d5765 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index fc28e2d702..d57db0589a 100644 +index 74dd72b3ac..44576bed42 100644 @@ -20,2 +21,2 @@ -@@ -629,4 +629,9 @@ static void dpdk_init(void) - } +@@ -528,4 +528,9 @@ static void dpdk_init(void) + eal_argv[i] = strdup(args[i]);