clk: st: remove null pointer dereference
PATCH 1/1 clk: st: remove null pointer dereference
If clk_data is NULL, it is not possible to access its clk_num field. So if the NULL test succeeds the control sequence mush jump after the loop. So, a new label is introduced and the labels are renamed to err0 and err1. If clk_data is NULL, only parents need to be freed and hence the goto now points to err0.
This problem was found using the following Coccinelle semantic match:
// <smpl>
@@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@
* if (E == NULL)
{
... when != if (E == NULL) S1 else S2
when != E = E1
* E->f
... when any
return ...;
}
else S3
// </smpl>
Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>
---
Not compile tested.
drivers/clk/st/clkgen-mux.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/clk/st/clkgen-mux.c +7 -6
@@ -723,14 +723,14 @@ void __init st_of_clkgen_vcc_setup(struct device_node *np) clk_data =kzalloc (sizeof (*clk_data),GFP_KERNEL );if (!clk_data) - goto err; + goto err0; clk_data->clk_num =VCC_MAX_CHANNELS ; clk_data->clks =kzalloc (clk_data->clk_num *sizeof (struct clk *),GFP_KERNEL );if (!clk_data->clks) - goto err; + goto err1;for (i =0 ; i < clk_data->clk_num; i++) {struct clk *clk;
@@ -791,7 +791,7 @@ void __init st_of_clkgen_vcc_setup(struct device_node *np)kfree (gate);kfree (div);kfree (mux); - goto err; + goto err1; } pr_debug("%s: parent %s rate %u\n",
@@ -807,7 +807,7 @@ void __init st_of_clkgen_vcc_setup(struct device_node *np)of_clk_add_provider (np, of_clk_src_onecell_get, clk_data);return ; -err: +err1:for (i =0 ; i < clk_data->clk_num; i++) {struct clk_composite *composite;
@@ -821,10 +821,11 @@ err: kfree(container_of(composite->mux_hw, struct clk_mux, hw)); } -if (clk_data) -kfree (clk_data->clks); +kfree (clk_data->clks);kfree (clk_data); + +err0:kfree (parents); }CLK_OF_DECLARE (clkgen_vcc,"st,clkgen-vcc" , st_of_clkgen_vcc_setup);
Signature · 1 line
1.9.1