Patch "mmc: sdhci check parameters before call dma_free_coherent" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
mmc: sdhci check parameters before call dma_free_coherent
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-sdhci-check-parameters-before-call-dma_free_coherent.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7ac020366b0a436d726408841160b5dc32c19214Mon Sep 17 00:00:00 2001
From: Peng Fan <[email protected]>
Date: Mon, 22 Jun 2015 11:41:23 +0800
Subject: mmc: sdhci check parameters before call dma_free_coherent
From: Peng Fan <[email protected]>
commit 7ac020366b0a436d726408841160b5dc32c19214 upstream.
We should not call dma_free_coherent if host->adma_table is NULL, otherwise may trigger panic.
--- drivers/mmc/host/sdhci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci.c +5 -2
@@ -3037,8 +3037,11 @@ int sdhci_add_host(struct sdhci_host *ho GFP_KERNEL); host->align_buffer =kmalloc (host->align_buffer_sz,GFP_KERNEL );if (!host->adma_table || !host->align_buffer) { -dma_free_coherent (mmc_dev (mmc), host->adma_table_sz, - host->adma_table, host->adma_addr); +if (host->adma_table) +dma_free_coherent (mmc_dev (mmc), + host->adma_table_sz, + host->adma_table, + host->adma_addr);kfree (host->align_buffer);pr_warn ("%s: Unable to allocate ADMA buffers - falling back to standard DMA\n" ,mmc_hostname (mmc));
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/mmc-sdhci-check-parameters-before-call-dma_free_coherent.patch