Commit a5488a35 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Ulf Hansson

mmc: wbsd: implement check for dma mapping error

wbsd_request_dma() does not check for dma mapping errors.

Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 16652a93
...@@ -1395,23 +1395,25 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma) ...@@ -1395,23 +1395,25 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma)
*/ */
host->dma_addr = dma_map_single(mmc_dev(host->mmc), host->dma_buffer, host->dma_addr = dma_map_single(mmc_dev(host->mmc), host->dma_buffer,
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL); WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
if (dma_mapping_error(mmc_dev(host->mmc), host->dma_addr))
goto kfree;
/* /*
* ISA DMA must be aligned on a 64k basis. * ISA DMA must be aligned on a 64k basis.
*/ */
if ((host->dma_addr & 0xffff) != 0) if ((host->dma_addr & 0xffff) != 0)
goto kfree; goto unmap;
/* /*
* ISA cannot access memory above 16 MB. * ISA cannot access memory above 16 MB.
*/ */
else if (host->dma_addr >= 0x1000000) else if (host->dma_addr >= 0x1000000)
goto kfree; goto unmap;
host->dma = dma; host->dma = dma;
return; return;
kfree: unmap:
/* /*
* If we've gotten here then there is some kind of alignment bug * If we've gotten here then there is some kind of alignment bug
*/ */
...@@ -1421,6 +1423,7 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma) ...@@ -1421,6 +1423,7 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma)
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL); WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
host->dma_addr = 0; host->dma_addr = 0;
kfree:
kfree(host->dma_buffer); kfree(host->dma_buffer);
host->dma_buffer = NULL; host->dma_buffer = NULL;
...@@ -1434,7 +1437,7 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma) ...@@ -1434,7 +1437,7 @@ static void wbsd_request_dma(struct wbsd_host *host, int dma)
static void wbsd_release_dma(struct wbsd_host *host) static void wbsd_release_dma(struct wbsd_host *host)
{ {
if (host->dma_addr) { if (!dma_mapping_error(mmc_dev(host->mmc), host->dma_addr)) {
dma_unmap_single(mmc_dev(host->mmc), host->dma_addr, dma_unmap_single(mmc_dev(host->mmc), host->dma_addr,
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL); WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment