Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: omap_udc: fix crashes on probe error and module removal

Browse Source 
We currently crash if usb_add_gadget_udc_release() fails, since the
udc->done is not initialized until in the remove function.
Furthermore, on module removal the udc data is accessed although
the release function is already triggered by usb_del_gadget_udc()
early in the function.

Fix by rewriting the release and remove functions, basically moving
all the cleanup into the release function, and doing the completion
only in the module removal case.

The patch fixes omap_udc module probe with a failing gadged, and also
allows the removal of omap_udc. Tested by running "modprobe omap_udc;
modprobe -r omap_udc" in a loop.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Aaro Koskinen 2018-11-25 00:17:05 +02:00 committed by Felipe Balbi
parent 286afdde16
commit 99f700366f
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/usb/gadget/udc/omap_udc.c
View File

@ -2593,9 +2593,22 @@ omap_ep_setup(char *name, u8 addr, u8 type,
static void omap_udc_release(struct device *dev) static void omap_udc_release(struct device *dev)
{ {
complete(udc->done); pullup_disable(udc);
if (!IS_ERR_OR_NULL(udc->transceiver)) {
usb_put_phy(udc->transceiver);
udc->transceiver = NULL;
}
omap_writew(0, UDC_SYSCON1);
remove_proc_file();
if (udc->dc_clk) {
if (udc->clk_requested)
omap_udc_enable_clock(0);
clk_put(udc->hhc_clk);
clk_put(udc->dc_clk);
}
if (udc->done)
complete(udc->done);
kfree(udc); kfree(udc);
udc = NULL;
} }
static int static int
@ -2900,12 +2913,8 @@ bad_on_1710:
} }
create_proc_file(); create_proc_file();
status = usb_add_gadget_udc_release(&pdev->dev, &udc->gadget, return usb_add_gadget_udc_release(&pdev->dev, &udc->gadget,
omap_udc_release); omap_udc_release);
if (!status)
return 0;
remove_proc_file();
cleanup1: cleanup1:
kfree(udc); kfree(udc);
@ -2932,36 +2941,15 @@ static int omap_udc_remove(struct platform_device *pdev)
{ {
DECLARE_COMPLETION_ONSTACK(done); DECLARE_COMPLETION_ONSTACK(done);
if (!udc)
return -ENODEV;
usb_del_gadget_udc(&udc->gadget);
if (udc->driver)
return -EBUSY;
udc->done = &done; udc->done = &done;
pullup_disable(udc); usb_del_gadget_udc(&udc->gadget);
if (!IS_ERR_OR_NULL(udc->transceiver)) {
usb_put_phy(udc->transceiver);
udc->transceiver = NULL;
}
omap_writew(0, UDC_SYSCON1);
remove_proc_file(); wait_for_completion(&done);
if (udc->dc_clk) {
if (udc->clk_requested)
omap_udc_enable_clock(0);
clk_put(udc->hhc_clk);
clk_put(udc->dc_clk);
}
release_mem_region(pdev->resource[0].start, release_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start + 1); pdev->resource[0].end - pdev->resource[0].start + 1);
wait_for_completion(&done);
return 0; return 0;
} }