| Message ID | 20221209094124.71043-1-yuancan@huawei.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | clk: tegra: tegra124-emc: Fix potential memory leak | expand |
Quoting Yuan Can (2022-12-09 01:41:24) > The tegra and tegra needs to be freed in the error handling path, otherwise > it will be leaked. > > Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver") > Signed-off-by: Yuan Can <yuancan@huawei.com> > --- Will anyone at Nvidia review this?
On Fri, Dec 09, 2022 at 09:41:24AM +0000, Yuan Can wrote: > The tegra and tegra needs to be freed in the error handling path, otherwise > it will be leaked. > > Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver") > Signed-off-by: Yuan Can <yuancan@huawei.com> > --- > drivers/clk/tegra/clk-tegra124-emc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/clk/tegra/clk-tegra124-emc.c b/drivers/clk/tegra/clk-tegra124-emc.c > index 219c80653dbd..2a6db0434281 100644 > --- a/drivers/clk/tegra/clk-tegra124-emc.c > +++ b/drivers/clk/tegra/clk-tegra124-emc.c > @@ -464,6 +464,7 @@ static int load_timings_from_dt(struct tegra_clk_emc *tegra, > err = load_one_timing_from_dt(tegra, timing, child); > if (err) { > of_node_put(child); > + kfree(tegra->timings); > return err; > } > > @@ -515,6 +516,7 @@ struct clk *tegra124_clk_register_emc(void __iomem *base, struct device_node *np > err = load_timings_from_dt(tegra, node, node_ram_code); > if (err) { > of_node_put(node); > + kfree(tegra); > return ERR_PTR(err); > } > } Don't we need another kfree(tegra) in case the clk_register() fails? We could do that as a follow-up and this patch isn't wrong, so: Acked-by: Thierry Reding <treding@nvidia.com>
Quoting Yuan Can (2022-12-09 01:41:24) > The tegra and tegra needs to be freed in the error handling path, otherwise > it will be leaked. > > Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver") > Signed-off-by: Yuan Can <yuancan@huawei.com> > --- Applied to clk-next
diff --git a/drivers/clk/tegra/clk-tegra124-emc.c b/drivers/clk/tegra/clk-tegra124-emc.c index 219c80653dbd..2a6db0434281 100644 --- a/drivers/clk/tegra/clk-tegra124-emc.c +++ b/drivers/clk/tegra/clk-tegra124-emc.c @@ -464,6 +464,7 @@ static int load_timings_from_dt(struct tegra_clk_emc *tegra, err = load_one_timing_from_dt(tegra, timing, child); if (err) { of_node_put(child); + kfree(tegra->timings); return err; } @@ -515,6 +516,7 @@ struct clk *tegra124_clk_register_emc(void __iomem *base, struct device_node *np err = load_timings_from_dt(tegra, node, node_ram_code); if (err) { of_node_put(node); + kfree(tegra); return ERR_PTR(err); } }
The tegra and tegra needs to be freed in the error handling path, otherwise it will be leaked. Fixes: 2db04f16b589 ("clk: tegra: Add EMC clock driver") Signed-off-by: Yuan Can <yuancan@huawei.com> --- drivers/clk/tegra/clk-tegra124-emc.c | 2 ++ 1 file changed, 2 insertions(+)