| Message ID | 20230912093407.21505-3-jiasheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/5] clk: mediatek: clk-mt6765: Add check for mtk_alloc_clk_data | expand |
Il 12/09/23 11:34, Jiasheng Jiang ha scritto: > Add the check for the return value of mtk_alloc_clk_data() in order to > avoid NULL pointer dereference. > > Fixes: 96596aa06628 ("clk: mediatek: add clk support for MT6797") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Quoting Jiasheng Jiang (2023-09-12 02:34:05) > Add the check for the return value of mtk_alloc_clk_data() in order to > avoid NULL pointer dereference. > > Fixes: 96596aa06628 ("clk: mediatek: add clk support for MT6797") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- Applied to clk-next
diff --git a/drivers/clk/mediatek/clk-mt6797.c b/drivers/clk/mediatek/clk-mt6797.c index 2ebd25f0ce71..f12d4e9ff0bb 100644 --- a/drivers/clk/mediatek/clk-mt6797.c +++ b/drivers/clk/mediatek/clk-mt6797.c @@ -390,6 +390,8 @@ static int mtk_topckgen_init(struct platform_device *pdev) return PTR_ERR(base); clk_data = mtk_alloc_clk_data(CLK_TOP_NR); + if (!clk_data) + return -ENOMEM; mtk_clk_register_factors(top_fixed_divs, ARRAY_SIZE(top_fixed_divs), clk_data); @@ -545,6 +547,8 @@ static void mtk_infrasys_init_early(struct device_node *node) if (!infra_clk_data) { infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR); + if (!infra_clk_data) + return; for (i = 0; i < CLK_INFRA_NR; i++) infra_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER); @@ -570,6 +574,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) if (!infra_clk_data) { infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR); + if (!infra_clk_data) + return -ENOMEM; } else { for (i = 0; i < CLK_INFRA_NR; i++) { if (infra_clk_data->hws[i] == ERR_PTR(-EPROBE_DEFER))
Add the check for the return value of mtk_alloc_clk_data() in order to avoid NULL pointer dereference. Fixes: 96596aa06628 ("clk: mediatek: add clk support for MT6797") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- drivers/clk/mediatek/clk-mt6797.c | 6 ++++++ 1 file changed, 6 insertions(+)