linux-kernel - [PATCH v3] spi: spi-imx: fix off-by-one in mx51 CPU mode burst length

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240318175119.3334-1-adam@jessamine.co.uk>
Date: Mon, 18 Mar 2024 17:50:52 +0000
From: Adam Butcher <adam@...samine.co.uk>
To: broonie@...nel.org,
	benjamin@...ler.one,
	carlos.song@....com,
	s.hauer@...gutronix.de,
	shawnguo@...nel.org,
	stefanmoring@...il.com
Cc: adam@...samine.co.uk,
	kernel@...gutronix.de,
	linux-imx@....com,
	linux-kernel@...r.kernel.org,
	linux-spi@...r.kernel.org
Subject: [PATCH v3] spi: spi-imx: fix off-by-one in mx51 CPU mode burst length

From: Adam Butcher <adam@...samine.co.uk>

c712c05e46c8 ("spi: imx: fix the burst length at DMA mode and CPU mode")
corrects three cases of setting the ECSPI burst length but erroneously
leaves the in-range CPU case one bit to big (in that field a value of
0 means 1 bit).  The effect was that transmissions that should have been
8-bit bytes appeared as 9-bit causing failed communication with SPI
devices.

Link: https://lore.kernel.org/all/20240201105451.507005-1-carlos.song@nxp.com/
Link: https://lore.kernel.org/all/20240204091912.36488-1-carlos.song@nxp.com/
Fixes: c712c05e46c8 ("spi: imx: fix the burst length at DMA mode and CPU mode")
Signed-off-by: Adam Butcher <adam@...samine.co.uk>
---

v2. Cleaned up body text.  No diff change.
v3. Corrected log message ref to upstream commit being fixed.  No diff change.

The original patch submission up to v4 (first link above) did not contain
the bug that this patch fixes.  It was introduced in the v5 update (second
link).

---
 drivers/spi/spi-imx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 7c1fcd5ed52f7..100552e6c56bc 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -743,8 +743,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
 				ctrl |= (MX51_ECSPI_CTRL_MAX_BURST * BITS_PER_BYTE - 1)
 						<< MX51_ECSPI_CTRL_BL_OFFSET;
 			else
-				ctrl |= spi_imx->count / DIV_ROUND_UP(spi_imx->bits_per_word,
-						BITS_PER_BYTE) * spi_imx->bits_per_word
+				ctrl |= (spi_imx->count / DIV_ROUND_UP(spi_imx->bits_per_word,
+						BITS_PER_BYTE) * spi_imx->bits_per_word - 1)
 						<< MX51_ECSPI_CTRL_BL_OFFSET;
 		}
 	}
-- 
2.43.0