mmc: sdhci: Clear unused bounce buffer at DMA mmap error path
PATCH 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.
--- drivers/mmc/host/sdhci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +5 -1
@@ -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->parent, 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
Quoted 10 lines · Takashi Iwai
When DMA-mapping of the bounce buffer fails, the driver tries to fall back, but it leaves the allocated
host->bounce_bufferalthough its size is zero. Later on, the driver checks the use of bounce buffer withhost->bounce_bufferpointer, and it tries to use the buffer incorrectly, resulting in Oops.This patch clears the release the unused buffer and clears the
bounce_bufferpointer for addressing the problem.Signed-off-by Takashi Iwai <[email protected]>
One minor comment below, otherwise:
Quoted 9 lines
--- drivers/mmc/host/sdhci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +0
-0
drivers/mmc/host/sdhci.c static void sdhci_allocate_bounce_buffer(struct sdhci_host *host) · line 4076
Quoted 6 lines
drivers/mmc/host/sdhci.c +2
-1@@ -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->parent, host->bounce_buffer);
Everywhere else in this function mmc_dev(mmc) is used, so maybe use it here too instead of mmc->parent.
Quoted 9 lines
drivers/mmc/host/sdhci.c +3
-0+ 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 */
Quoted 21 lines · Adrian Hunter
Quoted 10 lines · Takashi Iwai
When DMA-mapping of the bounce buffer fails, the driver tries to fall back, but it leaves the allocated
host->bounce_bufferalthough its size is zero. Later on, the driver checks the use of bounce buffer withhost->bounce_bufferpointer, and it tries to use the buffer incorrectly, resulting in Oops.This patch clears the release the unused buffer and clears the
bounce_bufferpointer for addressing the problem.Signed-off-by Takashi Iwai <[email protected]>One minor comment below, otherwise:
Acked-by Adrian Hunter <[email protected]>Quoted 4 lines
--- drivers/mmc/host/sdhci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 14 lines
drivers/mmc/host/sdhci.c static void sdhci_allocate_bounce_buffer(struct sdhci_host *host) · line 4076
Quoted 11 lines
drivers/mmc/host/sdhci.c +2
-1@@ -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->parent, host->bounce_buffer);Everywhere else in this function
mmc_dev(mmc)is used, so maybe use it here too instead ofmmc->parent.
Doh, right, I wrote a patch based on the older kernel and refreshed afterwards, but I forgot correcting this place. Will resubmit the fixed version.
thanks,
Takashi