diff options
| author | Alexey Khoroshilov | 2015-11-20 22:36:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-01 23:45:52 +0100 |
| commit | f9fa1887dcf26bd346665a6ae3d3f53dec54cba1 (patch) | |
| tree | 3764610ae00991b4a007f561826c4bec4e2c5d02 /drivers/usb/host/whci | |
| parent | usb: core : hub: Fix BOS 'NULL pointer' kernel panic (diff) | |
| download | kernel-qcow2-linux-f9fa1887dcf26bd346665a6ae3d3f53dec54cba1.tar.gz kernel-qcow2-linux-f9fa1887dcf26bd346665a6ae3d3f53dec54cba1.tar.xz kernel-qcow2-linux-f9fa1887dcf26bd346665a6ae3d3f53dec54cba1.zip | |
USB: whci-hcd: add check for dma mapping error
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/whci')
| -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); |