Skip to content

Commit

Permalink
s3c-hsudc: Fix possible nullpointer dereference during probe
Browse files Browse the repository at this point in the history
The usb-interrupt is requested before the endpoints are initalised.
If an interrupt happens in the time between request_irq and the init
of the endpoint-data (as seen on the Qisda ESx00 ebook-platforms),
it is therefore possible for the interrupt handler to access endpoint-
data before its creation resulting in a null-pointer dereference.

This patch simply moves the irq request below the endpoint init.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Heiko Stübner authored and Greg Kroah-Hartman committed Aug 22, 2011
1 parent 94ab23d commit da4fc14
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/usb/gadget/s3c-hsudc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1269,19 +1269,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
goto err_remap;
}

ret = platform_get_irq(pdev, 0);
if (ret < 0) {
dev_err(dev, "unable to obtain IRQ number\n");
goto err_irq;
}
hsudc->irq = ret;

ret = request_irq(hsudc->irq, s3c_hsudc_irq, 0, driver_name, hsudc);
if (ret < 0) {
dev_err(dev, "irq request failed\n");
goto err_irq;
}

spin_lock_init(&hsudc->lock);

device_initialize(&hsudc->gadget.dev);
Expand All @@ -1299,6 +1286,19 @@ static int s3c_hsudc_probe(struct platform_device *pdev)

s3c_hsudc_setup_ep(hsudc);

ret = platform_get_irq(pdev, 0);
if (ret < 0) {
dev_err(dev, "unable to obtain IRQ number\n");
goto err_irq;
}
hsudc->irq = ret;

ret = request_irq(hsudc->irq, s3c_hsudc_irq, 0, driver_name, hsudc);
if (ret < 0) {
dev_err(dev, "irq request failed\n");
goto err_irq;
}

hsudc->uclk = clk_get(&pdev->dev, "usb-device");
if (IS_ERR(hsudc->uclk)) {
dev_err(dev, "failed to find usb-device clock source\n");
Expand Down

0 comments on commit da4fc14

Please sign in to comment.