mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: eu@felipetonello.com
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Peter Chen <Peter.Chen@freescale.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Felipe Balbi <balbi@ti.com>,
	Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
	"Felipe F. Tonello" <eu@felipetonello.com>
Subject: [PATCH 1/2] usb: chipidea: udc: improve error handling on ep_queue
Date: Fri, 18 Sep 2015 18:12:40 +0100	[thread overview]
Message-ID: <1442596361-404-2-git-send-email-eu@felipetonello.com> (raw)
In-Reply-To: <1442596361-404-1-git-send-email-eu@felipetonello.com>

From: "Felipe F. Tonello" <eu@felipetonello.com>

_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 <eu@felipetonello.com>
---
 drivers/usb/chipidea/udc.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 764f668..7169113e 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -404,9 +404,9 @@ static inline u8 _usb_addr(struct ci_hw_ep *ep)
 }
 
 /**
- * _hardware_queue: configures a request at hardware level
- * @gadget: gadget
+ * _hardware_enqueue: configures a request at hardware level
  * @hwep:   endpoint
+ * @hwreq:  request
  *
  * This function returns an error code
  */
@@ -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);
 
@@ -750,8 +758,12 @@ static void isr_get_status_complete(struct usb_ep *ep, struct usb_request *req)
 
 /**
  * _ep_queue: queues (submits) an I/O request to an endpoint
+ * @ep:        endpoint
+ * @req:       request
+ * @gfp_flags: GFP flags (not used)
  *
  * Caller must hold lock
+ * This function returns an error code
  */
 static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
 		    gfp_t __maybe_unused gfp_flags)
-- 
2.1.4


  reply	other threads:[~2015-09-18 17:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-18 17:12 [PATCH 0/2] improve error handling on chipidea/udc.c and f_midi.c eu
2015-09-18 17:12 ` eu [this message]
2015-09-18 17:17   ` [PATCH 1/2] usb: chipidea: udc: improve error handling on ep_queue Felipe Balbi
2015-09-18 17:30     ` Felipe Tonello
2015-09-21  6:29   ` Peter Chen
2015-09-21  9:17     ` Felipe Tonello
2015-09-18 17:12 ` [PATCH 2/2] usb: gadget: f_midi: check for error on usb_ep_queue eu
2015-09-18 17:19   ` Felipe Balbi
2015-09-19 16:09   ` Sergei Shtylyov
2015-09-21  6:30   ` Peter Chen
2015-09-21  8:16     ` Felipe Tonello
2015-09-21  7:49       ` Peter Chen
2015-09-21  9:18         ` Felipe Tonello
2015-09-18 20:56 ` [PATCH 0/2] improve error handling on chipidea/udc.c and f_midi.c Albino B Neto
2015-09-18 20:58   ` Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442596361-404-2-git-send-email-eu@felipetonello.com \
    --to=eu@felipetonello.com \
    --cc=Peter.Chen@freescale.com \
    --cc=andrzej.p@samsung.com \
    --cc=balbi@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome