Unverified Commit 3de1320a authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-microchip-fixes-7.0' of... 

Merge tag 'clk-microchip-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-fixes

Pull a microchip clk driver fix from Claudiu Beznea:

 - Fix out of bounds access for MPFS CCC clock controller

* tag 'clk-microchip-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  clk: microchip: mpfs-ccc: fix out of bounds access during output registration
parents c3692998 2f7ae8ab

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);