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 DF97C43829 for ; Tue, 5 Mar 2024 16:35:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D82E742D2E; Tue, 5 Mar 2024 16:35:29 +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 4964942D2E for ; Tue, 5 Mar 2024 16:35:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652925; 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=0pGXlhJ6vuOJQz7Jew9W8OXtROFLM1wV7Alx4BvHLYY=; b=dQazH6T4kTIbeh8CliqRkkEAc8oIjmlVE3j4sjy402btSgzAdSFR3iYiTdYSPdQWxnpWby eVvKBZ/0kSa6+Qv0IKLDZPqR/wR+gtlj+3k1iY78x8wWfbkPpW6pe92ZZk14B5CNcE2XN9 hh6byMswxja9+j5113OjeS3ySyV+5SI= 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-70-y0tf5QvqOOqZquEzyTMnGw-1; Tue, 05 Mar 2024 10:35:22 -0500 X-MC-Unique: y0tf5QvqOOqZquEzyTMnGw-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 61C11800269; Tue, 5 Mar 2024 15:35:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9471A200B01D; Tue, 5 Mar 2024 15:35:21 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'app/pdump: verify strdup return' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:52 +0000 Message-ID: <20240305153449.263666-19-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/268ceff07fbed1e963a16bc99fa3fb717e929801 Thanks. Kevin --- >From 268ceff07fbed1e963a16bc99fa3fb717e929801 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:11 +0000 Subject: [PATCH] app/pdump: verify strdup return [ upstream commit 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 ] Add verify strdup return value logic. Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing") Signed-off-by: Chengwen Feng --- app/pdump/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/pdump/main.c b/app/pdump/main.c index 101ac7db9a..71fd83dada 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -172,4 +172,7 @@ parse_device_id(const char *key __rte_unused, const char *value, pt->device_id = strdup(value); + if (pt->device_id == NULL) + return -1; + pt->dump_by_type = DEVICE_ID; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.166635207 +0000 +++ 0019-app-pdump-verify-strdup-return.patch 2024-03-05 14:08:54.628520707 +0000 @@ -1 +1 @@ -From 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 Mon Sep 17 00:00:00 2001 +From 268ceff07fbed1e963a16bc99fa3fb717e929801 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 32e1cb918d4bbe94c5da8d0888ce29fac1f4dbb4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 7a1c7bdf60..a9205e130b 100644 +index 101ac7db9a..71fd83dada 100644