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 11A8A43C60 for ; Thu, 7 Mar 2024 02:33:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B4AD42ED4; Thu, 7 Mar 2024 02:33:55 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 94AEE40261 for ; Thu, 7 Mar 2024 02:33:53 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33e1207bba1so190460f8f.1 for ; Wed, 06 Mar 2024 17:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775233; x=1710380033; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=olYQGUilYjYYkeKvngCdXbvQLy2v98dqZu2LCB3GKmw=; b=iFKc6myvU08MOuuZGJhKwd3r5kiJBfMF86dv5HvCN/+MansTzW2AVqxU4OKjHFj8QS 4pjWi3VCegDweHvNTY5dDSt1tlL+dsFq41lWufWoPT1eWlTsmNiQMz6IfTyJurse4TP3 OJmIEp6T7vPbbzrFFCzCLnMQ8ra/ojovUlTqmLwHOmYHM31ugk0jGDQH3gKbepiEr0Rq TwU2FJrzI2AAbNMUoIkW3r4nID4w9xvKtOLd6kkZ4WE1Enc/LRzwACkwUukO5SfdrvAx 1mdvRGsPxDpcUkRoa5QujQeS0lbehpW+GN0dsshTNkz7DrKYkDLzGc2HY8tHatxSAXna BHcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775233; x=1710380033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=olYQGUilYjYYkeKvngCdXbvQLy2v98dqZu2LCB3GKmw=; b=VePxLMtNuoSVvXDBU8/4EbyLBBVN1/pNq4GH1C38qOKjuATzRKSXAL2AGdhtND4zv3 mEd82S579pQkO4a5Hr9gCb9c9K1yaTVavnzn6llZ3NwqgMDBfXp0U2ixLaYivbA1/yb0 zPRHhpAq1aj3TCJE6FiEs+nwLNgdKigTksSU8q1u9muA5Qmx9WhqTI5aXx4y4ijwz4cq 8W1gZLT+usb6eXit1WvpLGAOcqVxmg2ingMXBaT9g+L+YAbOX16fn7zZN/BYCgZgOFCc 7XXmnqpoNDvcUusPCQEev1ouQFm9rL/QSxI4ao7CBqHpXswh7RCBYh+HIiSi+kovi4YX CS/w== X-Gm-Message-State: AOJu0Yz5rArps4L2Ll2/w9ACvgaOolvekhyjCMINJCI24OZJC/sPavk/ g+Jg868H8po9kgjqmxRvU54YYD/vjBiaZNWeO1eON5QyHpLxnoUyiUUowbvD X-Google-Smtp-Source: AGHT+IHREdvO8ExIwVj6lGbd7YirqPwnKSgg2TcgP6cGb8gJ29UAJJUY5tp3t9zMoQlpzm+qaMcUOw== X-Received: by 2002:a05:6000:180c:b0:33d:d96b:2615 with SMTP id m12-20020a056000180c00b0033dd96b2615mr10960379wrh.47.1709775233223; Wed, 06 Mar 2024 17:33:53 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id u4-20020a056000038400b0033e456f6e7csm7353620wrf.1.2024.03.06.17.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:33:52 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: dpdk stable Subject: patch 'app/dumpcap: verify strdup return' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:45 +0000 Message-Id: <20240307013159.1735343-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8f29f8d8004b3398305a4a86a0a649d61b7bba8c Thanks. Luca Boccassi --- >From 8f29f8d8004b3398305a4a86a0a649d61b7bba8c 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 0c8e647598..0039aa1975 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -546,6 +546,11 @@ static void dpdk_init(void) eal_argv[i++] = strdup(file_prefix); } + 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:37.428643765 +0000 +++ 0028-app-dumpcap-verify-strdup-return.patch 2024-03-07 01:05:34.710938148 +0000 @@ -1 +1 @@ -From 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab Mon Sep 17 00:00:00 2001 +From 8f29f8d8004b3398305a4a86a0a649d61b7bba8c 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 0c8e647598..0039aa1975 100644 @@ -20 +21 @@ -@@ -628,6 +628,11 @@ static void dpdk_init(void) +@@ -546,6 +546,11 @@ static void dpdk_init(void)