Commit 0a5ad432 authored by Fei Shao's avatar Fei Shao Committed by Jassi Brar
Browse files

mailbox: mtk-cmdq: Fix local clock ID usage 



In the probe function, the clock IDs were pointed to local variables
which should only be used in the same code block, and any access to them
after the probing stage becomes an use-after-free case.

Since there are only limited variants of the gce clock names so far, we
can just declare them as static constants to fix the issue.

Fixes: 85dfdbfc ("mailbox: cmdq: add multi-gce clocks support for mt8195")
Signed-off-by: default avatarFei Shao <fshao@chromium.org>
Reviewed-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent 5c154b6a

drivers/mailbox/mtk-cmdq-mailbox.c

+3 −5
Original line number Diff line number Diff line
@@ -530,7 +530,8 @@ static int cmdq_probe(struct platform_device *pdev) 
	struct device_node *phandle = dev->of_node;

	struct device_node *node;

	int alias_id = 0;

	char clk_name[4] = "gce";

	static const char * const clk_name = "gce";

	static const char * const clk_names[] = { "gce0", "gce1" };



	cmdq = devm_kzalloc(dev, sizeof(*cmdq), GFP_KERNEL);

	if (!cmdq)
@@ -567,12 +568,9 @@ static int cmdq_probe(struct platform_device *pdev) 


	if (cmdq->gce_num > 1) {

		for_each_child_of_node(phandle->parent, node) {

			char clk_id[8];



			alias_id = of_alias_get_id(node, clk_name);

			if (alias_id >= 0 && alias_id < cmdq->gce_num) {

				snprintf(clk_id, sizeof(clk_id), "%s%d", clk_name, alias_id);

				cmdq->clocks[alias_id].id = clk_id;

				cmdq->clocks[alias_id].id = clk_names[alias_id];

				cmdq->clocks[alias_id].clk = of_clk_get(node, 0);

				if (IS_ERR(cmdq->clocks[alias_id].clk)) {

					dev_err(dev, "failed to get gce clk: %d\n", alias_id);