Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e352506e authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Greg Kroah-Hartman
Browse files

USB: whci-hcd: add more checks for dma mapping error 



Fixing checks for dma mapping error in qset_fill_page_list(),
I have missed two similar problems in qset_add_urb_sg() and
in qset_add_urb_sg_linearize().

v2: check validity of dma_addr with dma_mapping_error()
in qset_free_std() as suggested by Vladimir Zapolskiy.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4fc8bf5

drivers/usb/host/whci/qset.c

+6 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ void qset_free_std(struct whc *whc, struct whc_std *std) 
		kfree(std->bounce_buf);

	}

	if (std->pl_virt) {

		if (std->dma_addr)

		if (!dma_mapping_error(whc->wusbhc.dev, std->dma_addr))

			dma_unmap_single(whc->wusbhc.dev, std->dma_addr,

					 std->num_pointers * sizeof(struct whc_page_list_entry),

					 DMA_TO_DEVICE);
@@ -535,9 +535,11 @@ static int qset_add_urb_sg(struct whc *whc, struct whc_qset *qset, struct urb *u 
	list_for_each_entry(std, &qset->stds, list_node) {

		if (std->ntds_remaining == -1) {

			pl_len = std->num_pointers * sizeof(struct whc_page_list_entry);

			std->ntds_remaining = ntds--;

			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))

				return -EFAULT;

			std->ntds_remaining = ntds--;

		}

	}

	return 0;
@@ -618,6 +620,8 @@ static int qset_add_urb_sg_linearize(struct whc *whc, struct whc_qset *qset, 


		std->dma_addr = dma_map_single(&whc->umc->dev, std->bounce_buf, std->len,

					       is_out ? DMA_TO_DEVICE : DMA_FROM_DEVICE);

		if (dma_mapping_error(&whc->umc->dev, std->dma_addr))

			return -EFAULT;



		if (qset_fill_page_list(whc, std, mem_flags) < 0)

			return -ENOMEM;