spi: Ensure that sg_table won't be used after being freed
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 30 Sep 2022 11:34:08 +0000 (13:34 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 30 Sep 2022 11:56:29 +0000 (12:56 +0100)
SPI code checks for non-zero sgt->orig_nents to determine if the buffer
has been DMA-mapped. Ensure that sg_table is really zeroed after free to
avoid potential NULL pointer dereference if the given SPI xfer object is
reused again without being DMA-mapped.

Fixes: 0c17ba73c08f ("spi: Fix cache corruption due to DMA/PIO overlap")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20220930113408.19720-1-m.szyprowski@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c

index a4771f6..29a3098 100644 (file)
@@ -1102,6 +1102,8 @@ static void spi_unmap_buf_attrs(struct spi_controller *ctlr,
        if (sgt->orig_nents) {
                dma_unmap_sgtable(dev, sgt, dir, attrs);
                sg_free_table(sgt);
+               sgt->orig_nents = 0;
+               sgt->nents = 0;
        }
 }