From patchwork Sun Jun 13 05:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zpershuai X-Patchwork-Id: 12317303 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 36963C48BE8 for ; Sun, 13 Jun 2021 05:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12DB7611CE for ; Sun, 13 Jun 2021 05:29:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbhFMFbo (ORCPT ); Sun, 13 Jun 2021 01:31:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229685AbhFMFbn (ORCPT ); Sun, 13 Jun 2021 01:31:43 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB8B4C061574; Sat, 12 Jun 2021 22:29:27 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id t9so5981153pgn.4; Sat, 12 Jun 2021 22:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6AdJa+7WrAfZXyHfw2qNyNJLE7yY0Qr/CD/Tk8b4dL4=; b=aja0+fMUKycQTU0t/8Wj2w4U4OqO3dy13LeMaGgx+O5RrfQri1eEWXHsQIsQbOQhKx osu/Czw415aFn1JzF218SG//xcAaa+LgL2Nyg3QGG0oCyZcZW4Ver/F8cYlYdaMJ6U8r zBWt4sX3CwnfozqTEiQhIguXf66D9iWlsI/Klu6CnS9zmdON18V/abhfUT5eciBNJDfI mL8vpOHRd2ic595qzIp/v52wRHbqV43dvRxuVh0PEBWJ/qC+QnEgQZpZfT+qNxUbmPog g8e7+7ZqzQwgIQGZsj+p8lkof4qamrv+aFcdQOf4iRJRAkzaxNiWNZ+Y41eO/TUif9wi 4rBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6AdJa+7WrAfZXyHfw2qNyNJLE7yY0Qr/CD/Tk8b4dL4=; b=PHdTUTrJwg8EM+32/ERQARry6kQkgyWGfJ5j080zK8UVw7pNiRH+sXSwPbFJI0L8jC uJrCdp1v75gLagWjQhDogozg+vkzJ3xhqsS+ZCgmlE5CXWthTjyT44rxwvFG8qctKthv mR2CFp6VmNME9GU1tQB+t2YL90AtKhqiW80pCkYNfGKfwAkyv7FJxHjBYh8YhqE0TLz0 s/h6WZFfgLC+dHTOsTGeDUHurS8HPDJhgJa4fj6yURWf4e1qBQtUYWVBlqih13GLdPVw ehP/75xjKpWWizjUXY9c2d9v5LMEE+1O3ASr7Cb2sZDrgRSXDlmiYb/Il/M188O30ATD CU1g== X-Gm-Message-State: AOAM532Bsrnl2UuWpR/5UU0CkYh3sZqpIr389fXyU8mZZaN1/dFO2A+4 xX/tPB9yJxccUgZwuYgurCU= X-Google-Smtp-Source: ABdhPJzFeeQ2tdgUq7C9JKQ526BuE+bqLJ3Wdnj7gEMC6ZOwuUu/Mnc9icDaR2Ze5gpYzv82O8t1bw== X-Received: by 2002:aa7:808b:0:b029:2ef:cdd4:8297 with SMTP id v11-20020aa7808b0000b02902efcdd48297mr16032881pff.27.1623562162497; Sat, 12 Jun 2021 22:29:22 -0700 (PDT) Received: from localhost.members.linode.com ([2400:8902::f03c:92ff:fe55:8c1e]) by smtp.gmail.com with ESMTPSA id q68sm14397203pjq.45.2021.06.12.22.29.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 22:29:22 -0700 (PDT) From: zpershuai To: Mark Brown , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: zpershuai Subject: [PATCH v2 1/2] spi: meson-spicc: fix memory leak in meson_spicc_probe Date: Sun, 13 Jun 2021 13:29:16 +0800 Message-Id: <1623562156-21995-1-git-send-email-zpershuai@gmail.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org when meson_spicc_clk_init returns failed, it should goto the out_clk label. Signed-off-by: zpershuai Reviewed-by: Neil Armstrong --- drivers/spi/spi-meson-spicc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index ecba6b4..d675334 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -752,7 +752,7 @@ static int meson_spicc_probe(struct platform_device *pdev) ret = meson_spicc_clk_init(spicc); if (ret) { dev_err(&pdev->dev, "clock registration failed\n"); - goto out_master; + goto out_clk; } ret = devm_spi_register_master(&pdev->dev, master); From patchwork Sun Jun 13 05:29:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zpershuai X-Patchwork-Id: 12317305 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 E0101C48BCF for ; Sun, 13 Jun 2021 05:30:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BECC9611B0 for ; Sun, 13 Jun 2021 05:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229939AbhFMFcj (ORCPT ); Sun, 13 Jun 2021 01:32:39 -0400 Received: from mail-pg1-f180.google.com ([209.85.215.180]:45895 "EHLO mail-pg1-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229685AbhFMFci (ORCPT ); Sun, 13 Jun 2021 01:32:38 -0400 Received: by mail-pg1-f180.google.com with SMTP id q15so5961721pgg.12; Sat, 12 Jun 2021 22:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=e9wgkbzyfzIDSr2mxBQKx6UIoHjiY2DxbVr5qjZ/ndQ=; b=vHJYnC5k2pNMcAka9+8PsEV+JyHpNrO1Q+mca4ikgwPyM7J8kx4lxeRPtqW9GZpK3Q whTSpSpNpB8Pk4/Gvp/A0pGwknW5N6z4PX4GwTt35nMnkbpbWJcqASxvvOV3LqelFXwX Yv4prjK1qW0UN21MJtRc1mV7KNYDfeK631XncDCWQKxz1GCQD2W5HS00NqV85nG2Lj/p twILRHztLdECx9SFbU1OZM+DLe37FoOKBW6qJKPe10t34PakAGF546XTAWkn5mb6T3DC gFz5/R3sIR2MaHwdxwJeoQRYChFeQkayEvgXePxTQcb/INfK9byZ+O3u/JqE2GXRNFbP 1HBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e9wgkbzyfzIDSr2mxBQKx6UIoHjiY2DxbVr5qjZ/ndQ=; b=PjEIb3QczHUQ28PIVvcpOcY9idl8FM/BHDFvrmxeNRDY9CHmPITEwZrHHl6jzfranJ 0Ql5f4hq79tQODvjnEvYYD//P1kaZEkc0PWu6PqYtmskp6XVPgtnByScSfzSZW7h4HD0 EvC20AEg5h1kdE51E8/aVye6HDIrzQ6sF3iezWm6DnaAgW5ckwQ1qgGBEGGvArJ+LzCB kTnUhr9Fbqu2Kr8DOooMMMqyoE/PUNzYR0Ioij8xFKS3E24lzxlyGnva2UMIV6fn/0MW vwD5hXz7vQU+UzFF7/HhcPDQ9yiFfikTDpk2TEkoPAOIGhGqa76Ue+0aZoBtcpgvh9Bk ad1A== X-Gm-Message-State: AOAM531dKT30V7vfsEwMuV/OsNV+OUAknV5PMbegrsJoIsLhx0oTv7dc Z53DWWSFedFS/VplJVh4/io= X-Google-Smtp-Source: ABdhPJwa1Ill6bdxHT7ix4aev3b0DeJ4kB2NxTJRs3GR1xv0JqLnWXqYaOVRXpUeqq3RSx2rpNMaxw== X-Received: by 2002:a62:8491:0:b029:2e9:c618:fa32 with SMTP id k139-20020a6284910000b02902e9c618fa32mr15861684pfd.15.1623562178265; Sat, 12 Jun 2021 22:29:38 -0700 (PDT) Received: from localhost.members.linode.com ([2400:8902::f03c:92ff:fe55:8c1e]) by smtp.gmail.com with ESMTPSA id a9sm8810533pfo.69.2021.06.12.22.29.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 22:29:37 -0700 (PDT) From: zpershuai To: Mark Brown , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: zpershuai Subject: [PATCH v2 2/2] spi: meson-spicc: fix a wrong goto jump for avoiding memory leak. Date: Sun, 13 Jun 2021 13:29:32 +0800 Message-Id: <1623562172-22056-1-git-send-email-zpershuai@gmail.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org In meson_spifc_probe function, when enable the device pclk clock is error, it should use clk_disable_unprepare to release the core clock. Signed-off-by: zpershuai Reviewed-by: Neil Armstrong --- drivers/spi/spi-meson-spicc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index d675334..b2c4621 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -725,7 +725,7 @@ static int meson_spicc_probe(struct platform_device *pdev) ret = clk_prepare_enable(spicc->pclk); if (ret) { dev_err(&pdev->dev, "pclk clock enable failed\n"); - goto out_master; + goto out_core_clk; } device_reset_optional(&pdev->dev); @@ -764,9 +764,11 @@ static int meson_spicc_probe(struct platform_device *pdev) return 0; out_clk: - clk_disable_unprepare(spicc->core); clk_disable_unprepare(spicc->pclk); +out_core_clk: + clk_disable_unprepare(spicc->core); + out_master: spi_master_put(master);