* [PATCH v2] ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init
@ 2023-11-22 6:46 ` Kunwu Chan
0 siblings, 0 replies; 4+ messages in thread
From: Kunwu Chan @ 2023-11-22 6:46 UTC (permalink / raw)
To: linux, shawnguo, s.hauer, kernel, festevam, linux-imx, arnd,
angus.chen, u.kleine-koenig
Cc: linux-arm-kernel, linux-kernel, kunwu.chan, Kunwu Chan, Ahmad Fatoum
devm_kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.
Release the id allocated in 'mmdc_pmu_init' when 'devm_kasprintf'
return NULL
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Fixes: e76bdfd7403a ("ARM: imx: Added perf functionality to mmdc driver")
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
v2: Add new label to release the id allocated in 'mmdc_pmu_init'
---
arch/arm/mach-imx/mmdc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 2157493b78a9..df69af932375 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -501,6 +501,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
name = devm_kasprintf(&pdev->dev,
GFP_KERNEL, "mmdc%d", ret);
+ if (!name) {
+ ret = -ENOMEM;
+ goto pmu_release_id;
+ }
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
@@ -523,9 +527,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
pmu_register_err:
pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
- ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
hrtimer_cancel(&pmu_mmdc->hrtimer);
+pmu_release_id:
+ ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
pmu_free:
kfree(pmu_mmdc);
return ret;
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init
@ 2023-11-22 6:46 ` Kunwu Chan
0 siblings, 0 replies; 4+ messages in thread
From: Kunwu Chan @ 2023-11-22 6:46 UTC (permalink / raw)
To: linux, shawnguo, s.hauer, kernel, festevam, linux-imx, arnd,
angus.chen, u.kleine-koenig
Cc: linux-arm-kernel, linux-kernel, kunwu.chan, Kunwu Chan, Ahmad Fatoum
devm_kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.
Release the id allocated in 'mmdc_pmu_init' when 'devm_kasprintf'
return NULL
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Fixes: e76bdfd7403a ("ARM: imx: Added perf functionality to mmdc driver")
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
v2: Add new label to release the id allocated in 'mmdc_pmu_init'
---
arch/arm/mach-imx/mmdc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 2157493b78a9..df69af932375 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -501,6 +501,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
name = devm_kasprintf(&pdev->dev,
GFP_KERNEL, "mmdc%d", ret);
+ if (!name) {
+ ret = -ENOMEM;
+ goto pmu_release_id;
+ }
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
@@ -523,9 +527,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
pmu_register_err:
pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
- ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
hrtimer_cancel(&pmu_mmdc->hrtimer);
+pmu_release_id:
+ ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
pmu_free:
kfree(pmu_mmdc);
return ret;
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init
2023-11-22 6:46 ` Kunwu Chan
@ 2023-12-06 1:44 ` Shawn Guo
-1 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2023-12-06 1:44 UTC (permalink / raw)
To: Kunwu Chan
Cc: linux, s.hauer, kernel, festevam, linux-imx, arnd, angus.chen,
u.kleine-koenig, linux-arm-kernel, linux-kernel, kunwu.chan,
Ahmad Fatoum
On Wed, Nov 22, 2023 at 02:46:36PM +0800, Kunwu Chan wrote:
> devm_kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
>
> Release the id allocated in 'mmdc_pmu_init' when 'devm_kasprintf'
> return NULL
>
> Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Fixes: e76bdfd7403a ("ARM: imx: Added perf functionality to mmdc driver")
> Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init
@ 2023-12-06 1:44 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2023-12-06 1:44 UTC (permalink / raw)
To: Kunwu Chan
Cc: linux, s.hauer, kernel, festevam, linux-imx, arnd, angus.chen,
u.kleine-koenig, linux-arm-kernel, linux-kernel, kunwu.chan,
Ahmad Fatoum
On Wed, Nov 22, 2023 at 02:46:36PM +0800, Kunwu Chan wrote:
> devm_kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
>
> Release the id allocated in 'mmdc_pmu_init' when 'devm_kasprintf'
> return NULL
>
> Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> Fixes: e76bdfd7403a ("ARM: imx: Added perf functionality to mmdc driver")
> Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Applied, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-06 1:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-22 6:46 [PATCH v2] ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init Kunwu Chan
2023-11-22 6:46 ` Kunwu Chan
2023-12-06 1:44 ` Shawn Guo
2023-12-06 1:44 ` Shawn Guo
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.