spi: Add check for 8-bit transfer with 8 IO mode support

commit 710505212e3272396394f8cf78e3ddfd05df3f22 upstream.

The current SPI framework does not verify if the SPI device supports
8 IO mode when doing an 8-bit transfer. This patch adds a check to
ensure that if the transfer tx_nbits or rx_nbits is 8, the SPI mode must
support 8 IO. If not, an error is returned, preventing undefined behavior.

Fixes: d6a711a898672 ("spi: Fix OCTAL mode support")
Cc: stable@vger.kernel.org
Signed-off-by: Cheng Ming Lin <chengminglin@mxic.com.tw>
Link: https://patch.msgid.link/20250714031023.504752-1-linchengming884@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 0f3e6e2c24743cec1d1f4b23294a898194f7fb62..8d6341b0d8668c1aea85ae370c0aaed7f43e4459 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -4141,10 +4141,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
                                xfer->tx_nbits != SPI_NBITS_OCTAL)
                                return -EINVAL;
                        if ((xfer->tx_nbits == SPI_NBITS_DUAL) &&
-                               !(spi->mode & (SPI_TX_DUAL | SPI_TX_QUAD)))
+                               !(spi->mode & (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL)))
                                return -EINVAL;
                        if ((xfer->tx_nbits == SPI_NBITS_QUAD) &&
-                               !(spi->mode & SPI_TX_QUAD))
+                               !(spi->mode & (SPI_TX_QUAD | SPI_TX_OCTAL)))
+                               return -EINVAL;
+                       if ((xfer->tx_nbits == SPI_NBITS_OCTAL) &&
+                               !(spi->mode & SPI_TX_OCTAL))
                                return -EINVAL;
                }
                /* Check transfer rx_nbits */
@@ -4157,10 +4160,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
                                xfer->rx_nbits != SPI_NBITS_OCTAL)
                                return -EINVAL;
                        if ((xfer->rx_nbits == SPI_NBITS_DUAL) &&
-                               !(spi->mode & (SPI_RX_DUAL | SPI_RX_QUAD)))
+                               !(spi->mode & (SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                                return -EINVAL;
                        if ((xfer->rx_nbits == SPI_NBITS_QUAD) &&
-                               !(spi->mode & SPI_RX_QUAD))
+                               !(spi->mode & (SPI_RX_QUAD | SPI_RX_OCTAL)))
+                               return -EINVAL;
+                       if ((xfer->rx_nbits == SPI_NBITS_OCTAL) &&
+                               !(spi->mode & SPI_RX_OCTAL))
                                return -EINVAL;
                }