]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mtd: cqspi: Fix division by zero
authorMarek Vasut <marex@denx.de>
Tue, 14 Sep 2021 03:21:48 +0000 (05:21 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 4 Oct 2021 12:51:14 +0000 (08:51 -0400)
Both dummy.nbytes and dummy.buswidth may be zero. By not checking
the later, it is possible to trigger division by zero and a crash.
This does happen with tiny SPI NOR framework in SPL. Fix this by
adding the check and returning zero dummy bytes in such a case.

Fixes: 38b0852b0ea ("spi: cadence-qspi: Add support for octal DTR flashes")
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Pratyush Yadav <p.yadav@ti.com>
[trini: Drop Pratyush's RB as his requested changes weren't made as
        Marek disagreed]

drivers/spi/cadence_qspi_apb.c

index c36a652211a02a851248c61a908c72f2a1a21a34..429ee335db6ec948b19170d5f4f96da9aabd2922 100644 (file)
@@ -219,6 +219,9 @@ static unsigned int cadence_qspi_calc_dummy(const struct spi_mem_op *op,
 {
        unsigned int dummy_clk;
 
+       if (!op->dummy.nbytes || !op->dummy.buswidth)
+               return 0;
+
        dummy_clk = op->dummy.nbytes * (8 / op->dummy.buswidth);
        if (dtr)
                dummy_clk /= 2;