Commit 2f7ae8ab authored by Conor Dooley's avatar Conor Dooley
Browse files

clk: microchip: mpfs-ccc: fix out of bounds access during output registration 



UBSAN reported an out of bounds access during registration of the last
two outputs. This out of bounds access occurs because space is only
allocated in the hws array for two PLLs and the four output dividers
that each has, but the defined IDs contain two DLLS and their two
outputs each, which are not supported by the driver. The ID order is
PLLs -> DLLs -> PLL outputs -> DLL outputs. Decrement the PLL output IDs
by two while adding them to the array to avoid the problem.

Fixes: d39fb172 ("clk: microchip: add PolarFire SoC fabric clock support")
CC: stable@vger.kernel.org
Reviewed-by: default avatarBrian Masney <bmasney@redhat.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent 6de23f81

drivers/clk/microchip/clk-mpfs-ccc.c

+5 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int mpfs_ccc_register_outputs(struct device *dev, struct mpfs_ccc_out_hw_ 
			return dev_err_probe(dev, ret, "failed to register clock id: %d\n",

					     out_hw->id);



		data->hw_data.hws[out_hw->id] = &out_hw->divider.hw;

		data->hw_data.hws[out_hw->id - 2] = &out_hw->divider.hw;

	}



	return 0;
@@ -234,6 +234,10 @@ static int mpfs_ccc_probe(struct platform_device *pdev) 
	unsigned int num_clks;

	int ret;



	/*

	 * If DLLs get added here, mpfs_ccc_register_outputs() currently packs

	 * sparse clock IDs in the hws array

	 */

	num_clks = ARRAY_SIZE(mpfs_ccc_pll_clks) + ARRAY_SIZE(mpfs_ccc_pll0out_clks) +

		   ARRAY_SIZE(mpfs_ccc_pll1out_clks);