From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D1B2C07E95 for ; Sun, 4 Jul 2021 23:38:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D7B4E613B9 for ; Sun, 4 Jul 2021 23:38:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7B4E613B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Sg9ne+wLO1JwXzOMnZrR4FNfYXY0WbwGXaSimU0z0HM=; b=EMgY/I/o3qeo/9 oRM9q86UvP0Fk3qp+3n2KvFDqFVh9uBHomdhVzmUF+X2w5sY9dRVWLknJMyqdb9pWNzqLs3dY6ysx 6bjPrqyRDDjN/j/zZCnTPmdxZ5JfFwVOqh8VlKoPuq8bTnhZT9KvBx6bcEBdtuVQMR5QdDtupTxzs CxmXieQyV+R9RTbtF0Gm3VvRxThZdYjQ2wvs6/prZo655HIsN4MxRRedunDSrc8Z4I7nMvDRCXYAX KxQeo940GV3nhuXmVk3NTfC3d6duSt34XOCea9W7aNt4CCxAqzRdziUqGavatgAHduLobXJ1dv3Ay YlVUxoxqOq2y8/I+hHOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0BfQ-0079VY-K5; Sun, 04 Jul 2021 23:36:53 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0BDB-006uiZ-Ai for linux-arm-kernel@lists.infradead.org; Sun, 04 Jul 2021 23:07:42 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4DF606135D; Sun, 4 Jul 2021 23:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440061; bh=hvrLauVFWh743EloqAaqUKrqb2UFuN2LrjXSfW90LLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UMis4a6Su3JwDKqH6JjN4sM6TTX1GWPneXMS7XLVPCbxX7GcIpHHtyaxN0Dxgnotf Q6Ufh4LncEHhZH5DSzMtz682gBgrN0lI3Q6xSIz2XvfBh5f6BE5UyFHQHFx4lSJzQZ xK+whfrIOg/DJ5NllWccZLx78dAEgVlXDbSFlFYU2RkLvbtdXLLYO8mlkQgchc6cql eigZAikjoUo3BpGBxny3j59pJ3EGOMc/R38TnMgn5bx8ui/6fGDUpYrYGZ6XnbXFLF LWy+9NBWuhT7kSh15qL5q7TVQSQ8H85D1pwGvnwtSMD180JxsYWDtkzNN6ooBgH188 ijPQi3KJH5vpA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jing Xiangfeng , Dong Aisheng , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 63/80] drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() Date: Sun, 4 Jul 2021 19:05:59 -0400 Message-Id: <20210704230616.1489200-63-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_160741_424234_CD44E185 X-CRM114-Status: GOOD ( 10.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Jing Xiangfeng [ Upstream commit d96b1b8c9f79b6bb234a31c80972a6f422079376 ] ddr_perf_probe() misses to call ida_simple_remove() in an error path. Jump to cpuhp_state_err to fix it. Signed-off-by: Jing Xiangfeng Reviewed-by: Dong Aisheng Link: https://lore.kernel.org/r/20210617122614.166823-1-jingxiangfeng@huawei.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/fsl_imx8_ddr_perf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index be1f26b62ddb..4a56849f0400 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -706,8 +706,10 @@ static int ddr_perf_probe(struct platform_device *pdev) name = devm_kasprintf(&pdev->dev, GFP_KERNEL, DDR_PERF_DEV_NAME "%d", num); - if (!name) - return -ENOMEM; + if (!name) { + ret = -ENOMEM; + goto cpuhp_state_err; + } pmu->devtype_data = of_device_get_match_data(&pdev->dev); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D0EEC07E95 for ; Sun, 4 Jul 2021 23:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E1D361981 for ; Sun, 4 Jul 2021 23:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230416AbhGDXMI (ORCPT ); Sun, 4 Jul 2021 19:12:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:50660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232404AbhGDXKR (ORCPT ); Sun, 4 Jul 2021 19:10:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4DF606135D; Sun, 4 Jul 2021 23:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440061; bh=hvrLauVFWh743EloqAaqUKrqb2UFuN2LrjXSfW90LLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UMis4a6Su3JwDKqH6JjN4sM6TTX1GWPneXMS7XLVPCbxX7GcIpHHtyaxN0Dxgnotf Q6Ufh4LncEHhZH5DSzMtz682gBgrN0lI3Q6xSIz2XvfBh5f6BE5UyFHQHFx4lSJzQZ xK+whfrIOg/DJ5NllWccZLx78dAEgVlXDbSFlFYU2RkLvbtdXLLYO8mlkQgchc6cql eigZAikjoUo3BpGBxny3j59pJ3EGOMc/R38TnMgn5bx8ui/6fGDUpYrYGZ6XnbXFLF LWy+9NBWuhT7kSh15qL5q7TVQSQ8H85D1pwGvnwtSMD180JxsYWDtkzNN6ooBgH188 ijPQi3KJH5vpA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jing Xiangfeng , Dong Aisheng , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 63/80] drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() Date: Sun, 4 Jul 2021 19:05:59 -0400 Message-Id: <20210704230616.1489200-63-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jing Xiangfeng [ Upstream commit d96b1b8c9f79b6bb234a31c80972a6f422079376 ] ddr_perf_probe() misses to call ida_simple_remove() in an error path. Jump to cpuhp_state_err to fix it. Signed-off-by: Jing Xiangfeng Reviewed-by: Dong Aisheng Link: https://lore.kernel.org/r/20210617122614.166823-1-jingxiangfeng@huawei.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/fsl_imx8_ddr_perf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index be1f26b62ddb..4a56849f0400 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -706,8 +706,10 @@ static int ddr_perf_probe(struct platform_device *pdev) name = devm_kasprintf(&pdev->dev, GFP_KERNEL, DDR_PERF_DEV_NAME "%d", num); - if (!name) - return -ENOMEM; + if (!name) { + ret = -ENOMEM; + goto cpuhp_state_err; + } pmu->devtype_data = of_device_get_match_data(&pdev->dev); -- 2.30.2