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 D169843B86 for ; Tue, 5 Mar 2024 10:51:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA60B42B71; Tue, 5 Mar 2024 10:51:22 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2045.outbound.protection.outlook.com [40.107.244.45]) by mails.dpdk.org (Postfix) with ESMTP id 43E434026B for ; Tue, 5 Mar 2024 10:51:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LFufK5nDbjP0boUSzqjyUf1aVsv5lr+26fpOr0wb/lZwWWA34Z8DnJkCapQU69rb4ObuJWX0lVtmGmer8lXsS5hoVHwPiMR+yKks6yZRK+WKnXD9PiyjxkZh/z+WWeAuxwadsSETheh0wk9QO7JlmJRW0wd0VQEZIm/dtiLYgAoBpLFOviNxRVofB8bM8Gfcv3pc6UQ1+1o7eaXayYz0GjbXiPA5DAWyWs3H+MrInYsFj60XlHuu/K7dbdoFkiq5biL+I7Mo88Bk/O8a9qyeV/BYCBVtE/GTUDkVHqDI99DNlm+uYdYzTXbi+3zf4gsWBwQDEBESYaUhYTf6qQ6e8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bRFmpbs6e3jJR7SxIzYfYQIjbTItkHtR5PlFQLYR5/k=; b=FqS0xgSL9VkobFIhp97pXgrkEKtD9YBxV49YqFgzbQU6TeG74EMNfqb8hdqLpnN10HwsvLYRdzgP4wzJ0puRnDR30U9Tzfe1bHsAu5vsJ5C+lOGB2BpsokWShJlKRP7bY5CrHYI7OeGoc/iRprNgaonH/PLwmgJr+fYoA9jeA1QF53hmOCtbpZLL1RNC5hYYtd7srhpsUq/RH7ndfkCE0S9O+oQi2Pt4NNKcqe3X7sOTZ6+eqDsFAEOUeMrDx+j0luC3Yq0B/Asvmc3/t9awFTHbEzGubnrLKcJ3v276edjWaQb+cUO2jdRomooRsrM4HmWQqzMWTmONDtiwpiRxOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bRFmpbs6e3jJR7SxIzYfYQIjbTItkHtR5PlFQLYR5/k=; b=TYCtQ7363hEb3FdaBilfr2zhj+caluF4ouD0g2bFgmdd3X/W2NZZnpEkf/UrUpPUWH9Mo84R4x5vWB9892Sx1xVtTVDsTUSkonjaMvtkoCMZCg7pB22qDG0YWEsySKFsbPgPXOXs3omzIXXPR/PWCLhCSy4lV9I6MhwDyWrYhtHA7ziB/aAJbfiPzvdm4PqlqIy2k43H+LG0QTgLCgVbbLMU1Ocq56U4liuc2s64uLfAljv4SevPxsgxqZFVWj56dUDbnpIhRUss9Y75UBwMBAQohxNMOjOvAWIs//MdrZSmY0Vx9dlQVDo0ZEFjdWEokCuwi42PGg8PcNgAxmwsVw== Received: from PH7PR17CA0011.namprd17.prod.outlook.com (2603:10b6:510:324::20) by SA1PR12MB8161.namprd12.prod.outlook.com (2603:10b6:806:330::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:51:17 +0000 Received: from SN1PEPF0002BA4F.namprd03.prod.outlook.com (2603:10b6:510:324:cafe::cc) by PH7PR17CA0011.outlook.office365.com (2603:10b6:510:324::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:51:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002BA4F.mail.protection.outlook.com (10.167.242.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:51:16 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:51:01 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 5 Mar 2024 01:51:00 -0800 From: Xueming Li To: Chengwen Feng CC: dpdk stable Subject: patch 'app/dumpcap: verify strdup return' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:15 +0800 Message-ID: <20240305094757.439387-35-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA4F:EE_|SA1PR12MB8161:EE_ X-MS-Office365-Filtering-Correlation-Id: 614a9b83-63af-4565-326a-08dc3cf9cd36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nwIQWuzLMcUubshQxHg3x+uFEMuREg9PmBuH7xdanAaQ645HBuOQWTbGPJMZLSUbJaWanhgZlgwWMQ6+Q889b8KdAz+Ix9nyXuahxEyBz82b7DWJUCSAOg24fEVun2cCCP3S429TD2tHvi5qYlY8H0M/WYoWQWmP+Wpy2KOoKCzNX8qHpXVL4yO1auSjqmuDLtxuhFcaRY+Qs/cLIOeC4bqWi+KzKmWZkxeX0nGATuRyNXBAYc4qbytlNfJBwDAZNgLfklG2AE1YRIm4d3t5c9kthqAXsGbF40lFa+FtEBXD/0CetWl+OtwAZ02CfjtCwiVGrtzJip8mzU4HFVhB4j8cx7ptw38wo7gfTfaGB2uUsnT/e3fi0WVeV/reLbQRCxdIuVrF3dKpvzQKG4Zrp49jANvkXceDXMZrnrCOLhFRsu4Zm8OzEymIgbcG5YxrCo7Cu2c7RKfqvG4TaWvohkLVxwHfotC2UUdRrSQqT/Utbs6g4KO4rABifcDXuLSniq6qCx8BjOn/1RZtcQ5QGmM4bfeYvq8ppoQQNGz3CK5pIYoT4MKic7Rh5tzYbRrXBTCuMwHaSz78DgvFCh+sGV/RE9V8g6C6LrWbrB/eBv6vwtKCaky4UcJbDEXDmtu0QlXBprjLBqTY7CfMAnM60P6ev+HWSXAo1fDxVhxXfZjJ4IdeEK6fR78RE5NIxCrnxKKgHo7SZO/OX4CUlZHowL1/P7GYmRhO4mdEvqYWoPowtM9yAe0jGqTUb1FchGPy X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:51:16.5922 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 614a9b83-63af-4565-326a-08dc3cf9cd36 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA4F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8161 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 23.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/31/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=1387327fa4b3d0b0e8da1e0f97afc9c36a9ac35d Thanks. Xueming Li --- >From 1387327fa4b3d0b0e8da1e0f97afc9c36a9ac35d 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 Cc: Xueming Li [ 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 fc28e2d702..d57db0589a 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -628,6 +628,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.069435436 +0800 +++ 0034-app-dumpcap-verify-strdup-return.patch 2024-03-05 17:39:30.723566491 +0800 @@ -1 +1 @@ -From 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab Mon Sep 17 00:00:00 2001 +From 1387327fa4b3d0b0e8da1e0f97afc9c36a9ac35d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org