clk: ti: clkctrl: Fix returning uninitialized data (41b3588d) · Commits · 戴 / test

If we do a clk_get() for a clock that does not exists, we have _ti_omap4_clkctrl_xlate() return uninitialized data if no match is found. This can be seen in some cases with SLAB_DEBUG enabled: Unable to handle kernel paging request at virtual address 5a5a5a5a ... clk_hw_create_clk.part.33 sysc_notifier_call notifier_call_chain blocking_notifier_call_chain device_add Let's fix this by setting a found flag only when we find a match. Reported-by:

Tomi Valkeinen <tomi.valkeinen@ti.com> Fixes: ("clk: ti: add support for clkctrl clocks") Signed-off-by:

Tony Lindgren <tony@atomide.com> Tested-by:

Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by:

Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by:

Stephen Boyd <sboyd@kernel.org>

drivers/clk/ti/clkctrl.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -229,6 +229,7 @@ static struct clk_hw _ti_omap4_clkctrl_xlate(struct of_phandle_args clkspec,
	{		{
	struct omap_clkctrl_provider *provider = data;		struct omap_clkctrl_provider *provider = data;
	struct omap_clkctrl_clk *entry;		struct omap_clkctrl_clk *entry;
			bool found = false;

	if (clkspec->args_count != 2)		if (clkspec->args_count != 2)
	return ERR_PTR(-EINVAL);		return ERR_PTR(-EINVAL);
	@@ -238,11 +239,13 @@ static struct clk_hw _ti_omap4_clkctrl_xlate(struct of_phandle_args clkspec,

	list_for_each_entry(entry, &provider->clocks, node) {		list_for_each_entry(entry, &provider->clocks, node) {
	if (entry->reg_offset == clkspec->args[0] &&		if (entry->reg_offset == clkspec->args[0] &&
	entry->bit_offset == clkspec->args[1])		entry->bit_offset == clkspec->args[1]) {
			found = true;
	break;		break;
	}		}
			}

	if (!entry)		if (!found)
	return ERR_PTR(-EINVAL);		return ERR_PTR(-EINVAL);

	return entry->clk;		return entry->clk;

Admin message