Skip to contentSkip to conversation

mmc: sdhci: Clear unused bounce buffer at DMA mmap error path

PATCH In review Takashi Iwai 2 participants 2 messages Jun 11, 2021 – Jun 29, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mmc: sdhci: Clear unused bounce buffer at DMA mmap error path

When DMA-mapping of the bounce buffer fails, the driver tries to fall back, but it leaves the allocated host->bounce_buffer although its size is zero. Later on, the driver checks the use of bounce buffer with host->bounce_buffer pointer, and it tries to use the buffer incorrectly, resulting in Oops.

This patch clears the release the unused buffer and clears the bounce_buffer pointer for addressing the problem.

---
v1->v2: correct the device pointer to mmc_dev(mmc)

 drivers/mmc/host/sdhci.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +5 -1
index bf238ade1602..c80bc6c4ebf3 100644
@@ -4072,9 +4072,13 @@ static void sdhci_allocate_bounce_buffer(struct sdhci_host *host)
 					   bounce_size,
 					   DMA_BIDIRECTIONAL);
 	ret = dma_mapping_error(mmc_dev(mmc), host->bounce_addr);
-	if (ret)
+	if (ret) {
+		devm_kfree(mmc_dev(mmc), host->bounce_buffer);
+		host->bounce_buffer = NULL;
 		/* Again fall back to max_segs == 1 */
 		return;
+	}
+
 	host->bounce_buffer_size = bounce_size;
 
 	/* Lie about this since we're bouncing */
Signature · 1 line
2.26.2
#1 lore raw
Quoted 7 lines · Takashi Iwai

When DMA-mapping of the bounce buffer fails, the driver tries to fall back, but it leaves the allocated host->bounce_buffer although its size is zero. Later on, the driver checks the use of bounce buffer with host->bounce_buffer pointer, and it tries to use the buffer incorrectly, resulting in Oops.

Quoted 5 lines

This patch clears the release the unused buffer and clears the bounce_buffer pointer for addressing the problem.

Applied for fixes, thanks!

Kind regards
Uffe

Quoted 28 lines

---
v1->v2: correct the device pointer to mmc_dev(mmc)

 drivers/mmc/host/sdhci.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +5 -2
index bf238ade1602..c80bc6c4ebf3 100644
@@ -4072,9 +4072,13 @@ static void sdhci_allocate_bounce_buffer(struct sdhci_host *host)
                                           bounce_size,
                                           DMA_BIDIRECTIONAL);
        ret = dma_mapping_error(mmc_dev(mmc), host->bounce_addr);
-       if (ret)
+       if (ret) {
+               devm_kfree(mmc_dev(mmc), host->bounce_buffer);
+               host->bounce_buffer = NULL;
                /* Again fall back to max_segs == 1 */
                return;
+       }
+
        host->bounce_buffer_size = bounce_size;
 
        /* Lie about this since we're bouncing */
--

2.26.2