mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data
[ Upstream commit0d6e24b422
] Add the check for the return value of mtk_alloc_clk_data() in order to avoid NULL pointer dereference. Fixes:e986211827
("clk: mediatek: Add MT2701 clock support") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Link: https://lore.kernel.org/r/20230901024658.23405-1-jiasheng@iscas.ac.cn Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c26feedbc5
commit
6fccee2af4
1 changed files with 8 additions and 0 deletions
|
@ -690,6 +690,8 @@ static int mtk_topckgen_init(struct platform_device *pdev)
|
||||||
return PTR_ERR(base);
|
return PTR_ERR(base);
|
||||||
|
|
||||||
clk_data = mtk_alloc_clk_data(CLK_TOP_NR);
|
clk_data = mtk_alloc_clk_data(CLK_TOP_NR);
|
||||||
|
if (!clk_data)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
|
mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
|
||||||
clk_data);
|
clk_data);
|
||||||
|
@ -757,6 +759,8 @@ static void mtk_infrasys_init_early(struct device_node *node)
|
||||||
|
|
||||||
if (!infra_clk_data) {
|
if (!infra_clk_data) {
|
||||||
infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
|
infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
|
||||||
|
if (!infra_clk_data)
|
||||||
|
return;
|
||||||
|
|
||||||
for (i = 0; i < CLK_INFRA_NR; i++)
|
for (i = 0; i < CLK_INFRA_NR; i++)
|
||||||
infra_clk_data->clks[i] = ERR_PTR(-EPROBE_DEFER);
|
infra_clk_data->clks[i] = ERR_PTR(-EPROBE_DEFER);
|
||||||
|
@ -783,6 +787,8 @@ static int mtk_infrasys_init(struct platform_device *pdev)
|
||||||
|
|
||||||
if (!infra_clk_data) {
|
if (!infra_clk_data) {
|
||||||
infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
|
infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
|
||||||
|
if (!infra_clk_data)
|
||||||
|
return -ENOMEM;
|
||||||
} else {
|
} else {
|
||||||
for (i = 0; i < CLK_INFRA_NR; i++) {
|
for (i = 0; i < CLK_INFRA_NR; i++) {
|
||||||
if (infra_clk_data->clks[i] == ERR_PTR(-EPROBE_DEFER))
|
if (infra_clk_data->clks[i] == ERR_PTR(-EPROBE_DEFER))
|
||||||
|
@ -911,6 +917,8 @@ static int mtk_pericfg_init(struct platform_device *pdev)
|
||||||
return PTR_ERR(base);
|
return PTR_ERR(base);
|
||||||
|
|
||||||
clk_data = mtk_alloc_clk_data(CLK_PERI_NR);
|
clk_data = mtk_alloc_clk_data(CLK_PERI_NR);
|
||||||
|
if (!clk_data)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),
|
mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),
|
||||||
clk_data);
|
clk_data);
|
||||||
|
|
Loading…
Reference in a new issue