From: andrew.smirnov@gmail.com (Andrey Smirnov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/2] soc: imx: gpc: Do not pass static memory as platform data
Date: Mon, 22 Jan 2018 07:07:48 -0800 [thread overview]
Message-ID: <20180122150748.1742-2-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180122150748.1742-1-andrew.smirnov@gmail.com>
Platform device core assumes the ownership of dev.platform_data as
well as that it is dynamically allocated and it will try to kfree it
as a part of platform_device_release(). Change the code to pass
kzalloc'ed chunk of memory instead of a pointer to a static memory to
avoid causing a BUG() when calling platform_device_put().
The problem can be reproduced by artificially enabling the error path
of platform_device_add() call (around line 452).
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
Changes since [v1]:
- Replaced devm_kzalloc() with devm_kmalloc() as per suggestion from Stefan
[1] lkml.kernel.org/r/20180110161608.13015-2-andrew.smirnov at gmail.com
drivers/soc/imx/gpc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index 47e7aa963dbb..769aae647fed 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -18,6 +18,7 @@
#include <linux/pm_domain.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
#define GPC_CNTR 0x000
@@ -428,13 +429,19 @@ static int imx_gpc_probe(struct platform_device *pdev)
if (domain_index >= of_id_data->num_domains)
continue;
- domain = &imx_gpc_domains[domain_index];
+ domain = kmalloc(sizeof(*domain), GFP_KERNEL);
+ if (!domain) {
+ of_node_put(np);
+ return -ENOMEM;
+ }
+ memcpy(domain, &imx_gpc_domains[domain_index], sizeof(*domain));
domain->regmap = regmap;
domain->ipg_rate_mhz = ipg_rate_mhz;
pd_pdev = platform_device_alloc("imx-pgc-power-domain",
domain_index);
if (!pd_pdev) {
+ kfree(domain);
of_node_put(np);
return -ENOMEM;
}
--
2.14.3
next prev parent reply other threads:[~2018-01-22 15:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 15:07 [PATCH v2 1/2] soc: imx: gpcv2: Do not pass static memory as platform data Andrey Smirnov
2018-01-22 15:07 ` Andrey Smirnov [this message]
2018-02-08 6:47 ` Shawn Guo
2018-03-15 3:08 ` Shawn Guo
2018-03-15 13:00 ` Andrey Smirnov
2018-03-15 13:52 ` Shawn Guo
2018-03-15 14:12 ` Andrey Smirnov
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=20180122150748.1742-2-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).