All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xiaoming Ni <nixiaoming@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux@armlinux.org.uk>,
	<arnd@arndb.de>, <olof@lixom.net>, <21cnbao@gmail.com>,
	<grant.likely@secretlab.ca>, <santosh.shilimkar@ti.com>,
	<m.szyprowski@samsung.com>, <tony@atomide.com>,
	<t.figa@samsung.com>, <linux-arm-kernel@lists.infradead.org>
Cc: <nixiaoming@huawei.com>, <wangle6@huawei.com>
Subject: [PATCH] arm:cache-l2x0: Fix resource leak in the l2x0_of_init() failed branch
Date: Mon, 8 Nov 2021 12:05:10 +0800	[thread overview]
Message-ID: <20211108040510.14494-1-nixiaoming@huawei.com> (raw)

During the code review, some problems were found in the function l2x0_of_init().
1. Do not call Of_put_node() after calling of_find_match_node().
2. When __l2c_init() is called for identification, l2x0_base is not released.

Invoking Of_put_node() and iounmap() is added to solve this problem.

Fixes: 8c369264b6de3 ("ARM: 7009/1: l2x0: Add OF based initialization")
Fixes: 91c2ebb90b189 ("ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode")
Fixes: 6b49241ac2525 ("ARM: 8259/1: l2c: Refactor the driver to use commit-like interface")
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
---
 arch/arm/mm/cache-l2x0.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 43d91bfd2360..105bf7575cdf 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1766,17 +1766,22 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
 	u32 cache_id, old_aux;
 	u32 cache_level = 2;
 	bool nosync = false;
+	int ret;
 
 	np = of_find_matching_node(NULL, l2x0_ids);
 	if (!np)
 		return -ENODEV;
 
-	if (of_address_to_resource(np, 0, &res))
+	if (of_address_to_resource(np, 0, &res)) {
+		of_put_node(np);
 		return -ENODEV;
+	}
 
 	l2x0_base = ioremap(res.start, resource_size(&res));
-	if (!l2x0_base)
+	if (!l2x0_base) {
+		of_put_node(np);
 		return -ENOMEM;
+	}
 
 	l2x0_saved_regs.phy_base = res.start;
 
@@ -1820,6 +1825,12 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
 	else
 		cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID);
 
-	return __l2c_init(data, aux_val, aux_mask, cache_id, nosync);
+	ret = _l2c_init(data, aux_val, aux_mask, cache_id, nosync);
+	if (ret != 0) {
+		iounmap(l2x0_base);
+		l2x0_base = NULL;
+	}
+	of_put_node(np);
+	return ret;
 }
 #endif
-- 
2.27.0


WARNING: multiple messages have this Message-ID (diff)
From: Xiaoming Ni <nixiaoming@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux@armlinux.org.uk>,
	<arnd@arndb.de>,  <olof@lixom.net>, <21cnbao@gmail.com>,
	<grant.likely@secretlab.ca>, <santosh.shilimkar@ti.com>,
	<m.szyprowski@samsung.com>, <tony@atomide.com>,
	<t.figa@samsung.com>, <linux-arm-kernel@lists.infradead.org>
Cc: <nixiaoming@huawei.com>, <wangle6@huawei.com>
Subject: [PATCH] arm:cache-l2x0: Fix resource leak in the l2x0_of_init() failed branch
Date: Mon, 8 Nov 2021 12:05:10 +0800	[thread overview]
Message-ID: <20211108040510.14494-1-nixiaoming@huawei.com> (raw)

During the code review, some problems were found in the function l2x0_of_init().
1. Do not call Of_put_node() after calling of_find_match_node().
2. When __l2c_init() is called for identification, l2x0_base is not released.

Invoking Of_put_node() and iounmap() is added to solve this problem.

Fixes: 8c369264b6de3 ("ARM: 7009/1: l2x0: Add OF based initialization")
Fixes: 91c2ebb90b189 ("ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode")
Fixes: 6b49241ac2525 ("ARM: 8259/1: l2c: Refactor the driver to use commit-like interface")
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
---
 arch/arm/mm/cache-l2x0.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 43d91bfd2360..105bf7575cdf 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1766,17 +1766,22 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
 	u32 cache_id, old_aux;
 	u32 cache_level = 2;
 	bool nosync = false;
+	int ret;
 
 	np = of_find_matching_node(NULL, l2x0_ids);
 	if (!np)
 		return -ENODEV;
 
-	if (of_address_to_resource(np, 0, &res))
+	if (of_address_to_resource(np, 0, &res)) {
+		of_put_node(np);
 		return -ENODEV;
+	}
 
 	l2x0_base = ioremap(res.start, resource_size(&res));
-	if (!l2x0_base)
+	if (!l2x0_base) {
+		of_put_node(np);
 		return -ENOMEM;
+	}
 
 	l2x0_saved_regs.phy_base = res.start;
 
@@ -1820,6 +1825,12 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
 	else
 		cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID);
 
-	return __l2c_init(data, aux_val, aux_mask, cache_id, nosync);
+	ret = _l2c_init(data, aux_val, aux_mask, cache_id, nosync);
+	if (ret != 0) {
+		iounmap(l2x0_base);
+		l2x0_base = NULL;
+	}
+	of_put_node(np);
+	return ret;
 }
 #endif
-- 
2.27.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2021-11-08  4:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-08  4:05 Xiaoming Ni [this message]
2021-11-08  4:05 ` [PATCH] arm:cache-l2x0: Fix resource leak in the l2x0_of_init() failed branch Xiaoming Ni
2022-08-18  1:25 ` Xiaoming Ni
2022-08-18  1:25   ` Xiaoming Ni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211108040510.14494-1-nixiaoming@huawei.com \
    --to=nixiaoming@huawei.com \
    --cc=21cnbao@gmail.com \
    --cc=arnd@arndb.de \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=m.szyprowski@samsung.com \
    --cc=olof@lixom.net \
    --cc=santosh.shilimkar@ti.com \
    --cc=t.figa@samsung.com \
    --cc=tony@atomide.com \
    --cc=wangle6@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.