Unverified Commit 5c018e37 authored by Luis de Arquer's avatar Luis de Arquer Committed by Mark Brown
Browse files

spi: spi-rockchip: Fix out of bounds array access 



Since spi-rockchip enables use_gpio_descriptors and the
SPI_CONTROLLER_GPIO_SS flag, the spi subsytem may call set_cs()
for spi devices with indexes above ROCKCHIP_SPI_MAX_CS_NUM

Remove array cs_asserted[] which held a shadow copy of the state
of the chip select lines with the only purpose of optimizing out
rewriting a chip select line to the current state (no-op)
This case is already handled by spi.c

Signed-off-by: default avatarLuis de Arquer <luis.dearquer@inertim.com>
Link: https://lore.kernel.org/r/d0a0c4b94f933f7f43973c34765214303ee82b77.camel@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 83c9c7ec

drivers/spi/spi-rockchip.c

+0 −8
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ struct rockchip_spi { 
	u8 n_bytes;

	u8 rsd;



	bool cs_asserted[ROCKCHIP_SPI_MAX_CS_NUM];



	bool target_abort;

	bool cs_inactive; /* spi target tansmition stop when cs inactive */

	bool cs_high_supported; /* native CS supports active-high polarity */
@@ -245,10 +243,6 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable) 
	struct rockchip_spi *rs = spi_controller_get_devdata(ctlr);

	bool cs_asserted = spi->mode & SPI_CS_HIGH ? enable : !enable;



	/* Return immediately for no-op */

	if (cs_asserted == rs->cs_asserted[spi_get_chipselect(spi, 0)])

		return;



	if (cs_asserted) {

		/* Keep things powered as long as CS is asserted */

		pm_runtime_get_sync(rs->dev);
@@ -268,8 +262,6 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable) 
		/* Drop reference from when we first asserted CS */

		pm_runtime_put(rs->dev);

	}



	rs->cs_asserted[spi_get_chipselect(spi, 0)] = cs_asserted;

}



static void rockchip_spi_handle_err(struct spi_controller *ctlr,