leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: chipidea: udc: improve error handling on _hardware_enqueue

Browse Source 
_hardware_enqueue() 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>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
This commit is contained in:
Felipe F. Tonello
2015-10-27 10:36:32 +00:00
committed by Peter Chen
parent e46fed9fb3
commit 779debdf26
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/chipidea/udc.c
View File

@@ -434,19 +434,28 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
if (hwreq->req.dma % PAGE_SIZE) if (hwreq->req.dma % PAGE_SIZE)
pages--; pages--;
if (rest == 0) if (rest == 0) {
add_td_to_list(hwep, hwreq, 0); ret = add_td_to_list(hwep, hwreq, 0);
if (ret < 0)
goto done;
}
while (rest > 0) { while (rest > 0) {
unsigned count = min(hwreq->req.length - hwreq->req.actual, unsigned count = min(hwreq->req.length - hwreq->req.actual,
(unsigned)(pages * CI_HDRC_PAGE_SIZE)); (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; rest -= count;
} }
if (hwreq->req.zero && hwreq->req.length && hwep->dir == TX if (hwreq->req.zero && hwreq->req.length && hwep->dir == TX
&& (hwreq->req.length % hwep->ep.maxpacket == 0)) && (hwreq->req.length % hwep->ep.maxpacket == 0)) {
add_td_to_list(hwep, hwreq, 0); ret = add_td_to_list(hwep, hwreq, 0);
if (ret < 0)
goto done;
}
firstnode = list_first_entry(&hwreq->tds, struct td_node, td); firstnode = list_first_entry(&hwreq->tds, struct td_node, td);