clk: mediatek: clk-mt8173: fix potential memory leak
Subsystems (2)
PATCH 1/1 clk: mediatek: clk-mt8173: fix potential memory leak
From: chenqiwu <[email protected]>
Free clk_data or iomem resources if init is not successful.
Signed-off-by chenqiwu <[email protected]>
--- drivers/clk/mediatek/clk-mt8173.c | 43 +++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-)
drivers/clk/mediatek/clk-mt8173.c +34 -9
@@ -7,6 +7,7 @@#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/slab.h> #include "clk-mtk.h" #include "clk-gate.h"
@@ -941,9 +942,13 @@ static void __init mtk_topckgen_init(struct device_node *node) &mt8173_clk_lock, clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + clk_data =NULL ; +iounmap (base); + }mtk_clk_enable_critical (); }
@@ -964,9 +969,11 @@ static void __init mtk_infrasys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + }mtk_register_reset_controller (node,2 ,0x30 ); }
@@ -992,9 +999,12 @@ static void __init mtk_pericfg_init(struct device_node *node) &mt8173_clk_lock, clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); +iounmap (base); + }mtk_register_reset_controller (node,2 ,0 ); }
@@ -1117,9 +1127,14 @@ static void __init mtk_apmixedsys_init(struct device_node *node) clk_data->clks[CLK_APMIXED_HDMI_REF ] = clk; r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +clk_unregister_divider (clk); +kfree (clk_data); + clk_data =NULL ; +iounmap (base); + }mtk_clk_enable_critical (); }
@@ -1138,9 +1153,11 @@ static void __init mtk_imgsys_init(struct device_node *node) r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_imgsys,"mediatek,mt8173-imgsys" , mtk_imgsys_init);
@@ -1155,9 +1172,11 @@ static void __init mtk_mmsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_mmsys,"mediatek,mt8173-mmsys" , mtk_mmsys_init);
@@ -1172,9 +1191,11 @@ static void __init mtk_vdecsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vdecsys,"mediatek,mt8173-vdecsys" , mtk_vdecsys_init);
@@ -1189,9 +1210,11 @@ static void __init mtk_vencsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vencsys,"mediatek,mt8173-vencsys" , mtk_vencsys_init);
@@ -1206,8 +1229,10 @@ static void __init mtk_vencltsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vencltsys,"mediatek,mt8173-vencltsys" , mtk_vencltsys_init);
Signature · 1 line
1.9.1
Matthias Brugger
maintainerQuoted 22 lines · On 14/02/2020 04:34, [email protected] wrote:
From: chenqiwu <[email protected]>
Free
clk_dataor iomem resources if init is not successful.Signed-off-by chenqiwu <[email protected]>--- drivers/clk/mediatek/clk-mt8173.c | 43 +++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-)drivers/clk/mediatek/clk-mt8173.c +1
-0@@ -7,6 +7,7 @@#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/slab.h> #include "clk-mtk.h" #include "clk-gate.h"
drivers/clk/mediatek/clk-mt8173.c static void __init mtk_topckgen_init(struct device_node *node) · line 948
Quoted 8 lines
drivers/clk/mediatek/clk-mt8173.c +2
-1@@ -941,9 +942,13 @@ static void __init mtk_topckgen_init(struct device_node *node) &mt8173_clk_lock, clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data);
we have to free clk_data->clks as well, don't we? This holds for all the other hunks in this patch as well.
Actually a better solution would be to change mtk_alloc_clk_data to pass it a struct device and do devm_kzalloc etc. This way we won't need to deal with freeing data in case of error. This is an API change and includes changes to all clock drivers of MediaTek though.
Regards,
Matthias
Quoted 114 lines
drivers/clk/mediatek/clk-mt8173.c +31
-8+ clk_data =NULL ; +iounmap (base); + }mtk_clk_enable_critical (); }@@ -964,9 +969,11 @@ static void __init mtk_infrasys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + }mtk_register_reset_controller (node,2 ,0x30 ); }@@ -992,9 +999,12 @@ static void __init mtk_pericfg_init(struct device_node *node) &mt8173_clk_lock, clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); +iounmap (base); + }mtk_register_reset_controller (node,2 ,0 ); }@@ -1117,9 +1127,14 @@ static void __init mtk_apmixedsys_init(struct device_node *node) clk_data->clks[CLK_APMIXED_HDMI_REF ] = clk; r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +clk_unregister_divider (clk); +kfree (clk_data); + clk_data =NULL ; +iounmap (base); + }mtk_clk_enable_critical (); }@@ -1138,9 +1153,11 @@ static void __init mtk_imgsys_init(struct device_node *node) r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_imgsys,"mediatek,mt8173-imgsys" , mtk_imgsys_init);@@ -1155,9 +1172,11 @@ static void __init mtk_mmsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_mmsys,"mediatek,mt8173-mmsys" , mtk_mmsys_init);@@ -1172,9 +1191,11 @@ static void __init mtk_vdecsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vdecsys,"mediatek,mt8173-vdecsys" , mtk_vdecsys_init);@@ -1189,9 +1210,11 @@ static void __init mtk_vencsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vencsys,"mediatek,mt8173-vencsys" , mtk_vencsys_init);@@ -1206,8 +1229,10 @@ static void __init mtk_vencltsys_init(struct device_node *node) clk_data); r =of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); -if (r) +if (r) {pr_err ("%s(): could not register clock provider: %d\n" , __func__, r); +kfree (clk_data); + } }CLK_OF_DECLARE (mtk_vencltsys,"mediatek,mt8173-vencltsys" , mtk_vencltsys_init);