| Message ID | 3ebcf6ee-4ca7-d7dc-6e04-62bc4f9e1ead@omp.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Stop calling devm_request_irq() with invalid IRQs in the USB drivers | expand |
Sergey Shtylyov <s.shtylyov@omp.ru> writes: > The driver neglects to check the result of platform_get_irq()'s call and > blithely passes the negative error codes to devm_request_irq() (which takes > *unsigned* IRQ #), causing it to fail with -EINVAL, overriding an original > error code. Stop calling devm_request_irq() with the invalid IRQ #s. > > Fixes: 8b2e76687b39 ("USB: AT91 UDC updates, mostly power management") > Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> > > --- > drivers/usb/gadget/udc/at91_udc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > Index: usb/drivers/usb/gadget/udc/at91_udc.c > =================================================================== > --- usb.orig/drivers/usb/gadget/udc/at91_udc.c > +++ usb/drivers/usb/gadget/udc/at91_udc.c > @@ -1876,7 +1876,9 @@ static int at91udc_probe(struct platform > clk_disable(udc->iclk); > > /* request UDC and maybe VBUS irqs */ > - udc->udp_irq = platform_get_irq(pdev, 0); > + udc->udp_irq = retval = platform_get_irq(pdev, 0); > + if (retval < 0) > + goto err_unprepare_iclk; let's avoid multiple assignments in one line. How about: if (udc->udp_irq < 0) { retval = udc->udp_irq; goto err_unprepare_iclk; }
Index: usb/drivers/usb/gadget/udc/at91_udc.c =================================================================== --- usb.orig/drivers/usb/gadget/udc/at91_udc.c +++ usb/drivers/usb/gadget/udc/at91_udc.c @@ -1876,7 +1876,9 @@ static int at91udc_probe(struct platform clk_disable(udc->iclk); /* request UDC and maybe VBUS irqs */ - udc->udp_irq = platform_get_irq(pdev, 0); + udc->udp_irq = retval = platform_get_irq(pdev, 0); + if (retval < 0) + goto err_unprepare_iclk; retval = devm_request_irq(dev, udc->udp_irq, at91_udc_irq, 0, driver_name, udc); if (retval) {
The driver neglects to check the result of platform_get_irq()'s call and blithely passes the negative error codes to devm_request_irq() (which takes *unsigned* IRQ #), causing it to fail with -EINVAL, overriding an original error code. Stop calling devm_request_irq() with the invalid IRQ #s. Fixes: 8b2e76687b39 ("USB: AT91 UDC updates, mostly power management") Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> --- drivers/usb/gadget/udc/at91_udc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)