Commit d9f5b7f5 authored Dec 03, 2018 by Dan Carpenter Committed by Stephen Boyd Dec 03, 2018

clk: mvebu: Off by one bugs in cp110_of_clk_get()



These > comparisons should be >= to prevent reading beyond the end of
of the clk_data->hws[] buffer.

The clk_data->hws[] array is allocated in cp110_syscon_common_probe()
when we do:
	cp110_clk_data = devm_kzalloc(dev, sizeof(*cp110_clk_data) +
				      sizeof(struct clk_hw *) * CP110_CLK_NUM,
				      GFP_KERNEL);
As you can see, it has CP110_CLK_NUM elements which is equivalent to
CP110_MAX_CORE_CLOCKS + CP110_MAX_GATABLE_CLOCKS.

Fixes: d3da3eae ("clk: mvebu: new driver for Armada CP110 system controller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

parent d206e6b7

drivers/clk/mvebu/cp110-system-controller.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -200,11 +200,11 @@ static struct clk_hw cp110_of_clk_get(struct of_phandle_args clkspec,
		unsigned int idx = clkspec->args[1];

		if (type == CP110_CLK_TYPE_CORE) {
		if (idx > CP110_MAX_CORE_CLOCKS)
		if (idx >= CP110_MAX_CORE_CLOCKS)
		return ERR_PTR(-EINVAL);
		return clk_data->hws[idx];
		} else if (type == CP110_CLK_TYPE_GATABLE) {
		if (idx > CP110_MAX_GATABLE_CLOCKS)
		if (idx >= CP110_MAX_GATABLE_CLOCKS)
		return ERR_PTR(-EINVAL);
		return clk_data->hws[CP110_MAX_CORE_CLOCKS + idx];
		}