| Message ID | 20200720122343.178203-1-jingxiangfeng@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | clk: ti: clkctrl: add the missed kfree() for _ti_omap4_clkctrl_setup() | expand |
Quoting Jing Xiangfeng (2020-07-20 05:23:43) > _ti_omap4_clkctrl_setup() misses to call kfree() in an error path. Add > the missed function call to fix it. > > Fixes: 6c3090520554 ("clk: ti: clkctrl: Fix hidden dependency to node name") > Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> > --- > drivers/clk/ti/clkctrl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c > index 864c484bde1b..868e50132c21 100644 > --- a/drivers/clk/ti/clkctrl.c > +++ b/drivers/clk/ti/clkctrl.c > @@ -655,8 +655,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) > } > > hw = kzalloc(sizeof(*hw), GFP_KERNEL); > - if (!hw) > + if (!hw) { > + kfree(clkctrl_name); > return; > + } Why not goto cleanup? > > hw->enable_reg.ptr = provider->base + reg_data->offset; > > -- > 2.17.1 >
On 2020/7/28 9:24, Stephen Boyd wrote: > Quoting Jing Xiangfeng (2020-07-20 05:23:43) >> _ti_omap4_clkctrl_setup() misses to call kfree() in an error path. Add >> the missed function call to fix it. >> >> Fixes: 6c3090520554 ("clk: ti: clkctrl: Fix hidden dependency to node name") >> Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> >> --- >> drivers/clk/ti/clkctrl.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c >> index 864c484bde1b..868e50132c21 100644 >> --- a/drivers/clk/ti/clkctrl.c >> +++ b/drivers/clk/ti/clkctrl.c >> @@ -655,8 +655,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) >> } >> >> hw = kzalloc(sizeof(*hw), GFP_KERNEL); >> - if (!hw) >> + if (!hw) { >> + kfree(clkctrl_name); >> return; >> + } > > Why not goto cleanup? Thanks, I will change it as you suggested. > >> >> hw->enable_reg.ptr = provider->base + reg_data->offset; >> >> -- >> 2.17.1 >> > . >
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index 864c484bde1b..868e50132c21 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -655,8 +655,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) } hw = kzalloc(sizeof(*hw), GFP_KERNEL); - if (!hw) + if (!hw) { + kfree(clkctrl_name); return; + } hw->enable_reg.ptr = provider->base + reg_data->offset;
_ti_omap4_clkctrl_setup() misses to call kfree() in an error path. Add the missed function call to fix it. Fixes: 6c3090520554 ("clk: ti: clkctrl: Fix hidden dependency to node name") Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> --- drivers/clk/ti/clkctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)