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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE45DC35280 for ; Wed, 30 Mar 2022 12:15:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346304AbiC3MQT (ORCPT ); Wed, 30 Mar 2022 08:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344349AbiC3Lzu (ORCPT ); Wed, 30 Mar 2022 07:55:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A0072F383; Wed, 30 Mar 2022 04:54:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DFC0F6170D; Wed, 30 Mar 2022 11:54:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5135EC34116; Wed, 30 Mar 2022 11:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641240; bh=4QpLtH7S8RdCIQtLmepIpbKl1cszcxf5LaxKnqz6APU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TsS80mCFpL6uK34d9gNkIn8djeTKfYBcMq6yyO+dlQg52gOYsefwTbqxw+ox5a5Qq QcsDCGnn6Zhif5m2Ppuvr6s8z6fXLCtchbJgXT5wam6EBTP8nMcqTtlRYbKWg8uOuc cB14/6MVmaRfmXMWKFwKhwTrQq2aSME+O08g+UbiEBKa2IDTtLDYjDNhe6eXL8OhXL KNl+51HFc2En/Rko64SJTLFT1hdW1qFtW2F7jjBMhaHUh5bJ+ywp81Oe7akL9BJude ESuQzSZDBs0+WU+ZBHcKSewWVoHbch5u6a3IWqa2+UWOrG94qcdfc3pyx0Ni/rT6sR 4mNNMrr0z+2aQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Greg Kroah-Hartman , Arnd Bergmann , Sasha Levin , eric.y.miao@gmail.com, haojian.zhuang@gmail.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 15/20] ARM: mmp: Fix failure to remove sram device Date: Wed, 30 Mar 2022 07:53:31 -0400 Message-Id: <20220330115336.1672930-15-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115336.1672930-1-sashal@kernel.org> References: <20220330115336.1672930-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Uwe Kleine-König [ Upstream commit 4036b29a146b2749af3bb213b003eb69f3e5ecc4 ] Make sure in .probe() to set driver data before the function is left to make it possible in .remove() to undo the actions done. This fixes a potential memory leak and stops returning an error code in .remove() that is ignored by the driver core anyhow. Signed-off-by: Uwe Kleine-König Reviewed-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-mmp/sram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-mmp/sram.c b/arch/arm/mach-mmp/sram.c index bf5e64906e65..a41162dc4af4 100644 --- a/arch/arm/mach-mmp/sram.c +++ b/arch/arm/mach-mmp/sram.c @@ -75,6 +75,8 @@ static int sram_probe(struct platform_device *pdev) if (!info) return -ENOMEM; + platform_set_drvdata(pdev, info); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { dev_err(&pdev->dev, "no memory resource defined\n"); @@ -110,8 +112,6 @@ static int sram_probe(struct platform_device *pdev) list_add(&info->node, &sram_bank_list); mutex_unlock(&sram_lock); - platform_set_drvdata(pdev, info); - dev_info(&pdev->dev, "initialized\n"); return 0; @@ -130,17 +130,19 @@ static int sram_remove(struct platform_device *pdev) struct sram_bank_info *info; info = platform_get_drvdata(pdev); - if (info == NULL) - return -ENODEV; - mutex_lock(&sram_lock); - list_del(&info->node); - mutex_unlock(&sram_lock); + if (info->sram_size) { + mutex_lock(&sram_lock); + list_del(&info->node); + mutex_unlock(&sram_lock); + + gen_pool_destroy(info->gpool); + iounmap(info->sram_virt); + kfree(info->pool_name); + } - gen_pool_destroy(info->gpool); - iounmap(info->sram_virt); - kfree(info->pool_name); kfree(info); + return 0; } -- 2.34.1