]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
authorJosh Poimboeuf <jpoimboe@kernel.org>
Mon, 31 Mar 2025 15:33:32 +0000 (08:33 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 31 Mar 2025 15:38:32 +0000 (16:38 +0100)
If requested_clk > 128, cdns_mrvl_xspi_setup_clock() iterates over the
entire cdns_mrvl_xspi_clk_div_list array without breaking out early,
causing 'i' to go beyond the array bounds.

Fix that by stopping the loop when it gets to the last entry, clamping
the clock to the minimum 6.25 MHz.

Fixes the following warning with an UBSAN kernel:

  vmlinux.o: warning: objtool: cdns_mrvl_xspi_setup_clock: unexpected end of section .text.cdns_mrvl_xspi_setup_clock

Fixes: 26d34fdc4971 ("spi: cadence: Add clock configuration for Marvell xSPI overlay")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503282236.UhfRsF3B-lkp@intel.com/
Link: https://lore.kernel.org/r/gs2ooxfkblnee6cc5yfcxh7nu4wvoqnuv4lrllkhccxgcac2jg@7snmwd73jkhs
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://patch.msgid.link/h6bef6wof6zpjfp3jbhrkigqsnykdfy6j4qmmvb6gsabhianhj@k57a7hwpa3bj
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-xspi.c

index aed98ab143346792f20a8017b3710631061b387d..6dcba0e0ddaa3ee07f385d3a7445860011906073 100644 (file)
@@ -432,7 +432,7 @@ static bool cdns_mrvl_xspi_setup_clock(struct cdns_xspi_dev *cdns_xspi,
        u32 clk_reg;
        bool update_clk = false;
 
-       while (i < ARRAY_SIZE(cdns_mrvl_xspi_clk_div_list)) {
+       while (i < (ARRAY_SIZE(cdns_mrvl_xspi_clk_div_list) - 1)) {
                clk_val = MRVL_XSPI_CLOCK_DIVIDED(
                                cdns_mrvl_xspi_clk_div_list[i]);
                if (clk_val <= requested_clk)