diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2015-11-21 00:36:44 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-01-11 10:50:17 +0000 |
| commit | 7327ccc34dad04accc42d788787b3c42e3b4ba4f (patch) | |
| tree | d86a2b54b93fc86e4d0eef25a4c9c57902cd8a64 | |
| parent | 3eee4565faf8a8bd81b0ae5415c7ff5ea793c74e (diff) | |
| download | linux-stable-7327ccc34dad04accc42d788787b3c42e3b4ba4f.tar.gz linux-stable-7327ccc34dad04accc42d788787b3c42e3b4ba4f.tar.bz2 linux-stable-7327ccc34dad04accc42d788787b3c42e3b4ba4f.zip | |
USB: whci-hcd: add check for dma mapping error
commit f9fa1887dcf26bd346665a6ae3d3f53dec54cba1 upstream.
qset_fill_page_list() do not check for dma mapping errors.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/usb/host/whci/qset.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c index dc31c425ce01..9f1c0538b211 100644 --- a/drivers/usb/host/whci/qset.c +++ b/drivers/usb/host/whci/qset.c @@ -377,6 +377,10 @@ static int qset_fill_page_list(struct whc *whc, struct whc_std *std, gfp_t mem_f if (std->pl_virt == NULL) return -ENOMEM; std->dma_addr = dma_map_single(whc->wusbhc.dev, std->pl_virt, pl_len, DMA_TO_DEVICE); + if (dma_mapping_error(whc->wusbhc.dev, std->dma_addr)) { + kfree(std->pl_virt); + return -EFAULT; + } for (p = 0; p < std->num_pointers; p++) { std->pl_virt[p].buf_ptr = cpu_to_le64(dma_addr); |