From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139AbbIRRae (ORCPT ); Fri, 18 Sep 2015 13:30:34 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:35663 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752603AbbIRRab (ORCPT ); Fri, 18 Sep 2015 13:30:31 -0400 From: eu@felipetonello.com To: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Peter Chen , Greg Kroah-Hartman , Felipe Balbi , Andrzej Pietrasiewicz , "Felipe F. Tonello" Subject: [PATCH 2/3] usb: chipidea: udc: improve error handling on ep_queue Date: Fri, 18 Sep 2015 18:30:20 +0100 Message-Id: <1442597421-3641-2-git-send-email-eu@felipetonello.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442597421-3641-1-git-send-email-eu@felipetonello.com> References: <1442597421-3641-1-git-send-email-eu@felipetonello.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.1.4