From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753877AbbJ0J1k (ORCPT ); Tue, 27 Oct 2015 05:27:40 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:35778 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753722AbbJ0J1g (ORCPT ); Tue, 27 Oct 2015 05:27:36 -0400 Subject: Re: [PATCH 2/3] usb: chipidea: udc: improve error handling on ep_queue To: linux-usb@vger.kernel.org References: <1442597421-3641-1-git-send-email-eu@felipetonello.com> <1442597421-3641-2-git-send-email-eu@felipetonello.com> Cc: linux-kernel@vger.kernel.org, Peter Chen , Greg Kroah-Hartman , Felipe Balbi , Andrzej Pietrasiewicz From: Felipe Ferreri Tonello Message-ID: <562F4385.2020101@felipetonello.com> Date: Tue, 27 Oct 2015 09:27:33 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1442597421-3641-2-git-send-email-eu@felipetonello.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Peter, Have you seen this patch? I saw that you didn't apply it to your tree, so I wonder if it is good or do I have to change anything. This patch is a bug fix for a memory leak, so it is quite important. -- Felipe On 18/09/15 18:30, eu@felipetonello.com wrote: > From: "Felipe F. Tonello" > > _ep_queue() didn't check for errors when using add_td_to_list() > which can fail if dma_pool_alloc fails, thus causing a kernel > panic when lastnode->ptr is NULL. > > Signed-off-by: Felipe F. Tonello > --- > > Changes for v2: > - Use separate patch for cleanups. > > drivers/usb/chipidea/udc.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c > index c936c72..7169113e 100644 > --- a/drivers/usb/chipidea/udc.c > +++ b/drivers/usb/chipidea/udc.c > @@ -435,19 +435,27 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) > if (hwreq->req.dma % PAGE_SIZE) > pages--; > > - if (rest == 0) > - add_td_to_list(hwep, hwreq, 0); > + if (rest == 0) { > + ret = add_td_to_list(hwep, hwreq, 0); > + if (ret < 0) > + goto done; > + } > > while (rest > 0) { > unsigned count = min(hwreq->req.length - hwreq->req.actual, > (unsigned)(pages * CI_HDRC_PAGE_SIZE)); > - add_td_to_list(hwep, hwreq, count); > + ret = add_td_to_list(hwep, hwreq, count); > + if (ret < 0) > + goto done; > rest -= count; > } > > if (hwreq->req.zero && hwreq->req.length > - && (hwreq->req.length % hwep->ep.maxpacket == 0)) > - add_td_to_list(hwep, hwreq, 0); > + && (hwreq->req.length % hwep->ep.maxpacket == 0)) { > + ret = add_td_to_list(hwep, hwreq, 0); > + if (ret < 0) > + goto done; > + } > > firstnode = list_first_entry(&hwreq->tds, struct td_node, td); > >