Commit f316cdff authored by Kees Cook's avatar Kees Cook Committed by Stephen Boyd
Browse files

clk: Annotate struct clk_hw_onecell_data with __counted_by 

Prepare for the coming implementation by GCC and Clang of the __counted_by
attribute. Flexible array members annotated with __counted_by can have
their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
(for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
functions).

As found with Coccinelle[1], add __counted_by for struct clk_hw_onecell_data.
Additionally, since the element count member must be set before accessing
the annotated flexible array member, move its initialization earlier.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci



Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Taichi Sugaya <sugaya.taichi@socionext.com>
Cc: Takao Orito <orito.takao@socionext.com>
Cc: Qin Jian <qinjian@cqplus1.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>
Cc: linux-clk@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-aspeed@lists.ozlabs.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-sunxi@lists.linux.dev
Cc: linux-phy@lists.infradead.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230817203019.never.795-kees@kernel.org


Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 06c2afb8

drivers/clk/clk-aspeed.c

+1 −2
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ static void __init aspeed_cc_init(struct device_node *np) 
				  GFP_KERNEL);

	if (!aspeed_clk_data)

		return;

	aspeed_clk_data->num = ASPEED_NUM_CLKS;



	/*

	 * This way all clocks fetched before the platform device probes,
@@ -732,8 +733,6 @@ static void __init aspeed_cc_init(struct device_node *np) 
		aspeed_ast2500_cc(map);

	else

		pr_err("unknown platform, failed to add clocks\n");



	aspeed_clk_data->num = ASPEED_NUM_CLKS;

	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, aspeed_clk_data);

	if (ret)

		pr_err("failed to add DT provider: %d\n", ret);

drivers/clk/clk-ast2600.c

+1 −1
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ static void __init aspeed_g6_cc_init(struct device_node *np) 
				      ASPEED_G6_NUM_CLKS), GFP_KERNEL);

	if (!aspeed_g6_clk_data)

		return;

	aspeed_g6_clk_data->num = ASPEED_G6_NUM_CLKS;



	/*

	 * This way all clocks fetched before the platform device probes,
@@ -860,7 +861,6 @@ static void __init aspeed_g6_cc_init(struct device_node *np) 
	}



	aspeed_g6_cc(map);

	aspeed_g6_clk_data->num = ASPEED_G6_NUM_CLKS;

	ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, aspeed_g6_clk_data);

	if (ret)

		pr_err("failed to add DT provider: %d\n", ret);

drivers/clk/clk-gemini.c

+1 −1
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ static void __init gemini_cc_init(struct device_node *np) 
				  GFP_KERNEL);

	if (!gemini_clk_data)

		return;

	gemini_clk_data->num = GEMINI_NUM_CLKS;



	/*

	 * This way all clock fetched before the platform device probes,
@@ -457,7 +458,6 @@ static void __init gemini_cc_init(struct device_node *np) 
	gemini_clk_data->hws[GEMINI_CLK_APB] = hw;



	/* Register the clocks to be accessed by the device tree */

	gemini_clk_data->num = GEMINI_NUM_CLKS;

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, gemini_clk_data);

}

CLK_OF_DECLARE_DRIVER(gemini_cc, "cortina,gemini-syscon", gemini_cc_init);

drivers/clk/clk-milbeaut.c

+1 −2
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ static void __init m10v_cc_init(struct device_node *np) 


	if (!m10v_clk_data)

		return;

	m10v_clk_data->num = M10V_NUM_CLKS;



	base = of_iomap(np, 0);

	if (!base) {
@@ -654,8 +655,6 @@ static void __init m10v_cc_init(struct device_node *np) 
					base + CLKSEL(1), 0, 3, 0, rclk_table,

					&m10v_crglock, NULL);

	m10v_clk_data->hws[M10V_RCLK_ID] = hw;



	m10v_clk_data->num = M10V_NUM_CLKS;

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, m10v_clk_data);

}

CLK_OF_DECLARE_DRIVER(m10v_cc, "socionext,milbeaut-m10v-ccu", m10v_cc_init);

drivers/clk/clk-sp7021.c

+1 −2
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ static int sp7021_clk_probe(struct platform_device *pdev) 
				GFP_KERNEL);

	if (!clk_data)

		return -ENOMEM;

	clk_data->num = CLK_MAX;



	hws = clk_data->hws;

	pd_ext.index = 0;
@@ -688,8 +689,6 @@ static int sp7021_clk_probe(struct platform_device *pdev) 
			return PTR_ERR(hws[i]);

	}



	clk_data->num = CLK_MAX;



	return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data);

}