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 1DB68A0A0E for ; Mon, 10 May 2021 18:17:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1248C406A3; Mon, 10 May 2021 18:17:56 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2066.outbound.protection.outlook.com [40.107.243.66]) by mails.dpdk.org (Postfix) with ESMTP id 873B74110B for ; Mon, 10 May 2021 18:17:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Np4d2xBVzPmGudd2lIJXxCi32dKNKIkB0VPbgd/noYjIKbdN14cERzJoL2NKlH6yn40IOwCxyvvicmCBJ4krBUpBy4H2vZNwBQkcKxA4/440FMzsmpHn66qJ0N9ImxXHZ4ePWFuAIeG95hTzZKfFqgxLgkiky3LzKLEbLCdVxLazEBspwFm3LOJwegoiKR2xc17sp1CNKNTkI9xeS2kCx7shDSQCPAT/rovunp1UCLJq1D+uDsAqpYzg5rnb6KTQtzfg9Z4Xpzfdc6bpkWJNWAwwr+bPdsigGuY3O49bhlrLkKaU+wLI1iwnvUlyIphKgw4S0SjmbKmbVqlawdqnsQ== 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-SenderADCheck; bh=TChYBqn7rgrPcnTxwVFq/7g5BiI20rV3xOI75c4lZOo=; b=k9+CwstyeMDNQyStbk3UuhAg9BeqJ+PYY5uj5qv6iuDaRDDNOPyb6MUAXhFSbXouXpe+4djnzow6btvaWNHT/2sbaT7niQS7/b4zA+cEEYwu/AXEDrTbPehbSpn8GnQXv367G7B+h9BSF/XvRItyaM0rFp3g1MLxvUQQ9XeMlwUjQnrIr0e1fR9UNtzq0d693WYXonD9/x524gttb2acqRF2+KnoFQQnKilm8KStOm4EPaLKaFv4f0av0I3lknIXEL4AFNvYNHxHgeh9MtIWKIlGjKSpKJhhmm0XZ4CBOgGsgSgj7RkzaOKUSOEeS7KdmzvdyjcCXj9bfCgyEf/K1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=TChYBqn7rgrPcnTxwVFq/7g5BiI20rV3xOI75c4lZOo=; b=spGuT9pQcTsu4c9FAtnwzlQZ40DUHjCx2kz0npxjp4HS/8I0uC+5ADnDnV70wTCq6LMGIVz+i8vjb0RTmFNCv1jSqXWr4LuIneT0o44GhK7Cy8I3UIUPM0xMKJXvhwI+FJarjvtpZi+NQt0jGcLlf+9mfl74GQqTZUvS5CFkdu7PaxUzvFZw/GyEi9FgPigLMZbCt+fBySS8OH7qS21wkQ1NujLqjpgjgfacgS9oYIi7M2iA6h7FCatNOdOsASNUDOtA2USW27YACn09FSri0uCd223cnlVTYFaf4f/khFba7FQXr0CMeth2QEkfsJU1Ucmm9busRDOIF6kMebjjIg== Received: from DM6PR10CA0008.namprd10.prod.outlook.com (2603:10b6:5:60::21) by BN8PR12MB3411.namprd12.prod.outlook.com (2603:10b6:408:40::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:17:52 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::e5) by DM6PR10CA0008.outlook.office365.com (2603:10b6:5:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:17:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:52 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:17:50 +0000 From: Xueming Li To: Kalesh AP CC: Luca Boccassi , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 11 May 2021 00:01:36 +0800 Message-ID: <20210510160258.30982-147-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9384a14-b8fa-40e9-ad6c-08d913cf29b1 X-MS-TrafficTypeDiagnostic: BN8PR12MB3411: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1JPQpxX45eT/swnjPe+BA5hlMUhIwwphYeXIMh5zIvUeCyaIpsc4YHR76uVUUFlACMF3wMriqKXVBh/TOiW/YSLm7jBhlcQwIc4JKguv3mos6HJgcLWUJ06J2N6cZQyUc6RxmuF8y6N+0vWBzaU4P1k1gP4UOBvKcbU7FCfMwQVhsXVM923URx7pKZBNULtxObBCaNTakfm/XmeIHyqMmqExEm7RcpclW05OmWNaC8hMo5xAzoLnmW+J+05cf/tauPDW76mJIZ4zTvvoo6mC3L5OrjKNJgzq5OBd43aYEsMP1AC15QszucRvM0XvSCCJx2Vo2XIPtrjtl+2q+eJ3Vd5wHn0cOkLGLSfRcXljXW6skyRY1DlFUvO82JQhdh6S7hUWSrg4V6kK+wIvrc23NalfWMWOP1awLMYCaf8J2vpZ6hSKE+btCSa5bceseNumRgxCJwF87aP21qJMCpT+mL97hkFpB2QXfdnMunZX22sHeAWUl79rXb46TF0FErzx23/Q9s8N14KrHeFHd1og7E+rgzqklouGv8uLDY1IB1XaUQffu44k3o5obLHyRIhRUSUU6jJGeUhz9p8bwD/EnIp1MX29NdnvXqWyDarNTWiR4mIIOiFrmW8kc/9jflt9/KdGmLagbieMFuV23ORCN2iFdHVD+w2ZC05waa0D6cwn1buuwdhRiRvvG7eVK5bBVi+l63JqkFVrPORO/u1upD12xcrOjiHJjjOs+YNXA0G9frDQZup7FItDnv3EgAXAVpMiCuX3gwxLqzdg90Z+CA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(16526019)(186003)(70586007)(70206006)(26005)(82310400003)(2906002)(53546011)(6666004)(966005)(6916009)(6286002)(336012)(2616005)(86362001)(36906005)(426003)(5660300002)(8676002)(8936002)(47076005)(83380400001)(498600001)(54906003)(55016002)(7636003)(7696005)(36860700001)(356005)(36756003)(1076003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:52.7094 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a9384a14-b8fa-40e9-ad6c-08d913cf29b1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3411 Subject: [dpdk-stable] patch 'net/bnxt: fix double free in port start failure' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/bc53c25124f8af291c79cb315c95fad9202b8963 Thanks. Xueming Li --- >From bc53c25124f8af291c79cb315c95fad9202b8963 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 1 Apr 2021 08:23:34 +0530 Subject: [PATCH] net/bnxt: fix double free in port start failure Cc: Luca Boccassi [ upstream commit 39a03b401e4a72a118bae60c5834be2b6913098e ] During port start when bnxt_start_nic() fails, it tries to free "intr_handle->intr_vec" but the variable is not set to NULL after that. If port start fails, driver invokes bnxt_dev_stop() which will lead to a double free of "intr_handle->intr_vec". Fix it by removing the call to free "intr_handle->intr_vec" in the bnxt_start_nic() failure path as it is anyway doing in bnxt_dev_stop(). Fixes: 9d276b439aaf ("net/bnxt: fix error handling in device start") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 85c711b71f..e5fe1a687c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -797,7 +797,7 @@ skip_cosq_cfg: PMD_DRV_LOG(ERR, "Failed to allocate %d rx_queues" " intr_vec", bp->eth_dev->data->nb_rx_queues); rc = -ENOMEM; - goto err_disable; + goto err_out; } PMD_DRV_LOG(DEBUG, "intr_handle->intr_vec = %p " "intr_handle->nb_efd = %d intr_handle->max_intr = %d\n", @@ -817,12 +817,12 @@ skip_cosq_cfg: #ifndef RTE_EXEC_ENV_FREEBSD /* In FreeBSD OS, nic_uio driver does not support interrupts */ if (rc) - goto err_free; + goto err_out; #endif rc = bnxt_update_phy_setting(bp); if (rc) - goto err_free; + goto err_out; bp->mark_table = rte_zmalloc("bnxt_mark_table", BNXT_MARK_TABLE_SZ, 0); if (!bp->mark_table) @@ -830,10 +830,6 @@ skip_cosq_cfg: return 0; -err_free: - rte_free(intr_handle->intr_vec); -err_disable: - rte_intr_efd_disable(intr_handle); err_out: /* Some of the error status returned by FW may not be from errno.h */ if (rc > 0) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.408784000 +0800 +++ 0148-net-bnxt-fix-double-free-in-port-start-failure.patch 2021-05-10 23:59:26.570000000 +0800 @@ -1 +1 @@ -From 39a03b401e4a72a118bae60c5834be2b6913098e Mon Sep 17 00:00:00 2001 +From bc53c25124f8af291c79cb315c95fad9202b8963 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 39a03b401e4a72a118bae60c5834be2b6913098e ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index d346f96d7a..02fe00036b 100644 +index 85c711b71f..e5fe1a687c 100644 @@ -28 +30 @@ -@@ -793,7 +793,7 @@ skip_cosq_cfg: +@@ -797,7 +797,7 @@ skip_cosq_cfg: @@ -37 +39 @@ -@@ -813,12 +813,12 @@ skip_cosq_cfg: +@@ -817,12 +817,12 @@ skip_cosq_cfg: @@ -52 +54 @@ -@@ -826,10 +826,6 @@ skip_cosq_cfg: +@@ -830,10 +830,6 @@ skip_cosq_cfg: