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 A42EC457A1 for ; Mon, 12 Aug 2024 15:02:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E40440666; Mon, 12 Aug 2024 15:02:11 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2048.outbound.protection.outlook.com [40.107.220.48]) by mails.dpdk.org (Postfix) with ESMTP id 7E240402C3 for ; Mon, 12 Aug 2024 15:02:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jUELVchMZjKP4CerKLdL16Mr7U66gTuXIWb5fji4+RkoZFnuxeeOQrOexQ9fIZO1rtzd6/4+gbBAOC6TiaH2c9g2beCPJJ1YuRQcNJZ1ebMfuV6lCr5KJdphPsZW1cHGVlUr9ducLuTXouFRJOWn5B/jEADu6u8vGQ6+DwUfv49x0jx3Ra2hnpiFcZ+gK//0LdRGOJSz0T1TlQKJbe166fNVR0iQdYWogCkb5wKhcivZBTF0kmKG+fbN7QQEHZHT5u4zkQoX5xoe9xVlWPHx7iNrWVOamINtr4olYEXno2HGY4hQLgHeIYBkO6iaQW1O0elNwdbuxXW+9fRWguCLcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=cEqJhV2EkwnhSfR4ZwiIWJMlyawSWixlk2jy6M0fK9Q=; b=LOhQXdwjBplk626HIWSi2jBGBKRDpYlJaB2s66iAuWkJ6FuSECYfJImGTeyFU0mPxoRiMgiGoQD5WT9b4FPAZtiBGpV+wD5daG5RdzCQhjiJlfYLAoT+8+hRJnkAvEDI81VwVlLichnm3CPW9Bh0Flku9q4iuQms70qFc5orRn19l7YHCeBE3hANeBqzJjqiaTlBEOxzY+Hjpks3S2ODwKsCMqwYZRqxC4YRTtFKQr0I9tKCco77FglpUexOVC3gyer0oN0Qa8CUrr7sLTxsxCId74t22a8u+kV6yOF/oEDldD3GSiDRav0EwVG/LqG/I1LO8X9VHcx6w+x1oIF+sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=cEqJhV2EkwnhSfR4ZwiIWJMlyawSWixlk2jy6M0fK9Q=; b=XMMVeLB7jFoIe58kJ5fgQol3sBOrfSWmjpAidFeshPIOZv/5nIKIpykDKq9Y35Lo2w/QZwQK3RX5ahli8EaQdwvh8QamaYPmpppZjDiSQX/9PrcR5e8OWTR6nIUyZZuF9IdeR42wvL+67Gm93G/t4C7qYOUlUc1pzIzusmwI6P+wFNlxY6w5igDmcI/fYn3dUvCw3NOlsKygHPBo9zh/6pqABh9HgYKoyN9Ep1QTr4SU0/6aj2mUf7SwMUnFFQOX6Hldq7b6V0EFoDysFqGosowxaPnTMfSb/LXP+0xnYdoukNrQ6FJRTowPU9P1x8LYDPJxowE3hdTM5LT8MHvUZQ== Received: from SN7PR04CA0112.namprd04.prod.outlook.com (2603:10b6:806:122::27) by MW4PR12MB6976.namprd12.prod.outlook.com (2603:10b6:303:20a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:02:07 +0000 Received: from SN1PEPF0002636E.namprd02.prod.outlook.com (2603:10b6:806:122:cafe::ae) by SN7PR04CA0112.outlook.office365.com (2603:10b6:806:122::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 13:02:07 +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 SN1PEPF0002636E.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:02:07 +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.1544.4; Mon, 12 Aug 2024 06:01:42 -0700 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.1544.4; Mon, 12 Aug 2024 06:01:40 -0700 From: Xueming Li To: Vladimir Medvedkin CC: , Michael Theodore Stolarchuk , Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix memory leaks in raw pattern parsing' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:52 +0800 Message-ID: <20240812125035.389667-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636E:EE_|MW4PR12MB6976:EE_ X-MS-Office365-Filtering-Correlation-Id: 80e448fe-dc81-4270-41f8-08dcbacef85f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?56SqNDKKCtMKSd8P3GKq/dnxz6OqR7JE4pt3pGGkHVblPeA13mpicb7sOw2k?= =?us-ascii?Q?1FjfEJT6WsCQt0FNec0XDgXQrxPHFTd0ZaxWVpgLq81JTPX/EIAbuChgFBZn?= =?us-ascii?Q?zRxn7Y2q3QzCRbzZ9zkMdEIG6eVPqcdjVQxqwl51vS/BmpdvprPhlmzooihQ?= =?us-ascii?Q?zpG85wfofVn0DVL17VYpgv/PAnFPPJMleiSs2tlZG6oxpkWqcy8m3QAl30a2?= =?us-ascii?Q?MM987KJClEQ71vyOC/vfiO0xmo74p+62/ZkWSYfDRHpk3Z2Ve7f3LB4lNwpb?= =?us-ascii?Q?e85VeF69zeBYPIUVq1Nl54xB+wc09CvxcRyAbZmiVuQm+HHWBjFkRYDh+qBA?= =?us-ascii?Q?SU1S9AziM5k/iorWZ5zxr0bIl1sXeXQxLkxEfmoxxjsZTN4YbYlwjN0w2k3R?= =?us-ascii?Q?hnYrMrj1pykodZFgFcrSuQIAdxjioRcnWt/7/gDbHAAe2OshED4YATyt4Pkl?= =?us-ascii?Q?9nn1HDtQFVEELnqBQCjliFgbClvNtdXkWyJ7+4ib+3pMWT4UC/0iuvwTPLLg?= =?us-ascii?Q?RcbZqizS95i9vq59+GHqIPf2Ng5FTmB/IjmHQDX68/ZtyZX3K3DNU+MckJeD?= =?us-ascii?Q?GaIWIvQcdx56fQRJF1T+zqRWL0MNIS8epn3gICd8t77JGFsyjVEE/T2zfOhC?= =?us-ascii?Q?7cvDrec/IKnnUjPmuwF+Gdx76ACa51jfeZovLTU4ZW+ui5HzFGW40mjC+D7K?= =?us-ascii?Q?zcwhub04XgDkSC3Bht2usL6UKfDaFcPnDwBF50e76o92Z5YhifSm6OjY8Pd0?= =?us-ascii?Q?uIqtRktsHAjsyMJbd2EyNDnuhauhIbsW5tbtkuZo0AyMtH+BX8LngKrCE+Tb?= =?us-ascii?Q?myGvXS5LIYqVhEIFsuWxDk2hbbpZ5UXnuDWlQKzJLX8zx1cZZDFHFtLp5uSR?= =?us-ascii?Q?282aAsI52oeuZ8964ySPZhaMH6q8jrDpdj2mZoZOmmOOIwUifvJIbMuww7rL?= =?us-ascii?Q?SPZkq1MA67m1/X6HT27JhAhEnfiHL/hujh9VCDMXYOkfA8wj7+1xVeyTMI4e?= =?us-ascii?Q?HGATAu0Ly3xN8Ykn/taryPBwMq+5Hxi3hAT8xCR8b8mWcpmZvfFaUhhMyTRF?= =?us-ascii?Q?NrQZ7Mt+/FlCafdxwApLHyZ7hmwFPsanmnO8SQ4FWA1Tb+XuJJx9oaOzgGKg?= =?us-ascii?Q?uVPSLFwZ5zCnSuNk0UBZaT16wo9Nxkq49TRH/6PggBqPLgu/ugc3eDUKC1NJ?= =?us-ascii?Q?5XN51bhSY6n2gRgN4EHnzSyOVnbdFQqTv9DNfsjGcgfdZlaxOG1CKVM852Kk?= =?us-ascii?Q?IZT4b/UEMsHuU98tutIt6bmt6mmFEg2a/6GPjpo8DZejpfjjZx0dpa5krOEX?= =?us-ascii?Q?dVcF3KGJs/YH1iBmB3IzBOFJD7nV680Sz6Q/AzU3P1SzByZDk7kM9nTjUvdj?= =?us-ascii?Q?EfN+ODveyHfPHhs2TLJacwFRNpUmKNR26ZUA2JctdPy4SVER61m+1niragLt?= =?us-ascii?Q?GHXKImCUOJjW4/vnlwajxhAY/gCIEjXl?= 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:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:02:07.1383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80e448fe-dc81-4270-41f8-08dcbacef85f 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: SN1PEPF0002636E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6976 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=17e800edd19dc5cb00acf53ffd8baef713954c9c Thanks. Xueming Li --- >From 17e800edd19dc5cb00acf53ffd8baef713954c9c Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 22 Jul 2024 13:50:44 +0000 Subject: [PATCH] net/ice: fix memory leaks in raw pattern parsing Cc: Xueming Li [ upstream commit 8044e1d19db3d0012bd1348cb4fcf542d31cd41a ] This patch fixes possible memory leaks inside the ice_hash_parse_raw_pattern() due to the lack of a call to rte_free() for previously allocated pkt_buf and msk_buf. Fixes: 1b9c68120a1c ("net/ice: enable protocol agnostic flow offloading in RSS") Reported-by: Michael Theodore Stolarchuk Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- .mailmap | 1 + drivers/net/ice/ice_hash.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index 4a92c054fb..bea129355d 100644 --- a/.mailmap +++ b/.mailmap @@ -953,6 +953,7 @@ Michael Santana Michael Savisko Michael Shamis Michael S. Tsirkin +Michael Theodore Stolarchuk Michael Wildt Michal Berger Michal Jastrzebski diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index f923641533..6b3095e2c5 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -650,7 +650,7 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, uint8_t *pkt_buf, *msk_buf; uint8_t tmp_val = 0; uint8_t tmp_c = 0; - int i, j; + int i, j, ret = 0; if (ad->psr == NULL) return -rte_errno; @@ -670,8 +670,10 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, return -ENOMEM; msk_buf = rte_zmalloc(NULL, pkt_len, 0); - if (!msk_buf) + if (!msk_buf) { + rte_free(pkt_buf); return -ENOMEM; + } /* convert string to int array */ for (i = 0, j = 0; i < spec_len; i += 2, j++) { @@ -708,18 +710,22 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad, msk_buf[j] = tmp_val * 16 + tmp_c - '0'; } - if (ice_parser_run(ad->psr, pkt_buf, pkt_len, &rslt)) - return -rte_errno; + ret = ice_parser_run(ad->psr, pkt_buf, pkt_len, &rslt); + if (ret) + goto free_mem; - if (ice_parser_profile_init(&rslt, pkt_buf, msk_buf, - pkt_len, ICE_BLK_RSS, true, &prof)) - return -rte_errno; + ret = ice_parser_profile_init(&rslt, pkt_buf, msk_buf, + pkt_len, ICE_BLK_RSS, true, &prof); + if (ret) + goto free_mem; rte_memcpy(&meta->raw.prof, &prof, sizeof(prof)); +free_mem: rte_free(pkt_buf); rte_free(msk_buf); - return 0; + + return ret; } static void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:06.156823909 +0800 +++ 0115-net-ice-fix-memory-leaks-in-raw-pattern-parsing.patch 2024-08-12 20:44:02.445069363 +0800 @@ -1 +1 @@ -From 8044e1d19db3d0012bd1348cb4fcf542d31cd41a Mon Sep 17 00:00:00 2001 +From 17e800edd19dc5cb00acf53ffd8baef713954c9c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8044e1d19db3d0012bd1348cb4fcf542d31cd41a ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index a6088813cc..541ca895a4 100644 +index 4a92c054fb..bea129355d 100644 @@ -25 +27 @@ -@@ -978,6 +978,7 @@ Michael Santana +@@ -953,6 +953,7 @@ Michael Santana