mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
@ 2025-03-28 16:08 Josh Poimboeuf
  2025-03-29  4:36 ` [PATCH v2] " Josh Poimboeuf
  0 siblings, 1 reply; 5+ messages in thread
From: Josh Poimboeuf @ 2025-03-28 16:08 UTC (permalink / raw)
  To: x86
  Cc: linux-kernel, Mark Brown, Witold Sadowski, Ingo Molnar,
	Peter Zijlstra, kernel test robot

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
'i' to 128.

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/
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 drivers/spi/spi-cadence-xspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index aed98ab14334..b7ac4385c49f 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -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)
-- 
2.48.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
  2025-03-28 16:08 [PATCH] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock() Josh Poimboeuf
@ 2025-03-29  4:36 ` Josh Poimboeuf
  2025-03-31 12:16   ` Mark Brown
  0 siblings, 1 reply; 5+ messages in thread
From: Josh Poimboeuf @ 2025-03-29  4:36 UTC (permalink / raw)
  To: x86
  Cc: linux-kernel, Mark Brown, Witold Sadowski, Ingo Molnar,
	Peter Zijlstra, kernel test robot

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/
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
v2: Fix typo in commit log

 drivers/spi/spi-cadence-xspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index aed98ab14334..b7ac4385c49f 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -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)
-- 
2.48.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
  2025-03-29  4:36 ` [PATCH v2] " Josh Poimboeuf
@ 2025-03-31 12:16   ` Mark Brown
  2025-03-31 15:33     ` [PATCH v3] " Josh Poimboeuf
  0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2025-03-31 12:16 UTC (permalink / raw)
  To: Josh Poimboeuf
  Cc: x86, linux-kernel, Witold Sadowski, Ingo Molnar, Peter Zijlstra,
	kernel test robot

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

On Fri, Mar 28, 2025 at 09:36:30PM -0700, Josh Poimboeuf wrote:
> 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.

> -	while (i < ARRAY_SIZE(cdns_mrvl_xspi_clk_div_list)) {
> +	while (i < ARRAY_SIZE(cdns_mrvl_xspi_clk_div_list)-1) {

The usual coding style would be to have spaces around the - here.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
  2025-03-31 12:16   ` Mark Brown
@ 2025-03-31 15:33     ` Josh Poimboeuf
  2025-03-31 18:12       ` Mark Brown
  0 siblings, 1 reply; 5+ messages in thread
From: Josh Poimboeuf @ 2025-03-31 15:33 UTC (permalink / raw)
  To: Mark Brown
  Cc: x86, linux-kernel, Witold Sadowski, Ingo Molnar, Peter Zijlstra,
	kernel test robot

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>
---
v3: fix "- 1" spacing

 drivers/spi/spi-cadence-xspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index aed98ab14334..6dcba0e0ddaa 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -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)
-- 
2.48.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
  2025-03-31 15:33     ` [PATCH v3] " Josh Poimboeuf
@ 2025-03-31 18:12       ` Mark Brown
  0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2025-03-31 18:12 UTC (permalink / raw)
  To: Josh Poimboeuf
  Cc: x86, linux-kernel, Witold Sadowski, Ingo Molnar, Peter Zijlstra,
	kernel test robot

On Mon, 31 Mar 2025 08:33:32 -0700, Josh Poimboeuf wrote:
> 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock()
      commit: 7ba0847fa1c22e7801cebfe5f7b75aee4fae317e

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-03-31 18:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-28 16:08 [PATCH] spi: cadence: Fix out-of-bounds array access in cdns_mrvl_xspi_setup_clock() Josh Poimboeuf
2025-03-29  4:36 ` [PATCH v2] " Josh Poimboeuf
2025-03-31 12:16   ` Mark Brown
2025-03-31 15:33     ` [PATCH v3] " Josh Poimboeuf
2025-03-31 18:12       ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®