From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751142AbdHXBCb (ORCPT ); Wed, 23 Aug 2017 21:02:31 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:38504 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbdHXBCa (ORCPT ); Wed, 23 Aug 2017 21:02:30 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1C19D60389 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jackp@codeaurora.org Date: Wed, 23 Aug 2017 18:02:27 -0700 From: Jack Pham To: Alexey Khoroshilov Cc: Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: Re: [PATCH] usb: gadget: pch_udc: add checks for dma mapping errors Message-ID: <20170824010227.GC30841@usblab-sd-06.qualcomm.com> References: <1503528428-16901-1-git-send-email-khoroshilov@ispras.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1503528428-16901-1-git-send-email-khoroshilov@ispras.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 24, 2017 at 01:47:08AM +0300, Alexey Khoroshilov wrote: > There are no checks for dma mapping errors in pch_udc. > Tha patch adds the checks and error handling code. > Compile tested only. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov > --- > drivers/usb/gadget/udc/pch_udc.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c > index 84dcbcd756f0..a305f8392082 100644 > --- a/drivers/usb/gadget/udc/pch_udc.c > +++ b/drivers/usb/gadget/udc/pch_udc.c > @@ -1767,7 +1767,7 @@ static struct usb_request *pch_udc_alloc_request(struct usb_ep *usbep, > req->req.dma = DMA_ADDR_INVALID; > req->dma = DMA_ADDR_INVALID; > INIT_LIST_HEAD(&req->queue); > - if (!ep->dev->dma_addr) > + if (ep->dev->dma_addr != DMA_ADDR_INVALID) > return &req->req; > /* ep0 in requests are allocated from data pool here */ > dma_desc = dma_pool_alloc(ep->dev->data_requests, gfp, > @@ -1879,6 +1879,13 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq, > usbreq->length, > DMA_FROM_DEVICE); > } > + if (dma_mapping_error(&dev->pdev->dev, req->dma)) { > + req->dma = DMA_ADDR_INVALID; > + retval = -ENOMEM; > + if ((unsigned long)(usbreq->buf) & 0x03) > + kfree(req->buf); > + goto probe_end; > + } > req->dma_mapped = 1; > } > if (usbreq->length > 0) { > @@ -2961,6 +2968,10 @@ static int init_dma_pools(struct pch_udc_dev *dev) > dev->dma_addr = dma_map_single(&dev->pdev->dev, ep0out_buf, > UDC_EP0OUT_BUFF_SIZE * 4, > DMA_FROM_DEVICE); > + if (dma_mapping_error(&dev->pdev->dev, dev->dma_addr)) { > + dev->dma_addr = DMA_ADDR_INVALID; > + return -ENOMEM; > + } Wouldn't this driver be better off using the usb_gadget_{map,unmap}_request() functions provided by UDC core.c? dma_mapping_error() is provided for free that way. Jack -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project