From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966143AbeAJQQu (ORCPT + 1 other); Wed, 10 Jan 2018 11:16:50 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:40038 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965442AbeAJQQ2 (ORCPT ); Wed, 10 Jan 2018 11:16:28 -0500 X-Google-Smtp-Source: ACJfBoseolN0kN2pTsi1H8uF+bLlisGQMrhQFR3QaN/MR4gTkjvuctUwPXqyRI0wXNVC8cYIYhJ0Hw== From: Andrey Smirnov To: Shawn Guo Cc: Andrey Smirnov , Stefan Agner , Lucas Stach , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] soc: imx: gpc: Do not pass static memory as platform data Date: Wed, 10 Jan 2018 08:16:08 -0800 Message-Id: <20180110161608.13015-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110161608.13015-1-andrew.smirnov@gmail.com> References: <20180110161608.13015-1-andrew.smirnov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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 Cc: Stefan Agner Cc: Lucas Stach Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Andrey Smirnov --- This patch is a follow up to fix one of the bugs discussed in lkml.kernel.org/r/3f836677c6e98aaf01bc1ac8c3410083@agner.ch 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..ec8b79abebac 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -18,6 +18,7 @@ #include #include #include +#include #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 = kzalloc(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