Commit 0602088b authored Jun 20, 2018 by Jia-Ju Bai Committed by Felipe Balbi Jul 17, 2018

usb: gadget: r8a66597: Fix two possible sleep-in-atomic-context bugs in init_controller()



The driver may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.16.7 are:

[FUNC] msleep
drivers/usb/gadget/udc/r8a66597-udc.c, 839:
		msleep in init_controller
drivers/usb/gadget/udc/r8a66597-udc.c, 96:
		init_controller in r8a66597_usb_disconnect
drivers/usb/gadget/udc/r8a66597-udc.c, 93:
		spin_lock in r8a66597_usb_disconnect

[FUNC] msleep
drivers/usb/gadget/udc/r8a66597-udc.c, 835:
		msleep in init_controller
drivers/usb/gadget/udc/r8a66597-udc.c, 96:
		init_controller in r8a66597_usb_disconnect
drivers/usb/gadget/udc/r8a66597-udc.c, 93:
		spin_lock in r8a66597_usb_disconnect

To fix these bugs, msleep() is replaced with mdelay().

This bug is found by my static analysis tool (DSAC-2) and checked by
my code review.

Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

parent 50b9773c

drivers/usb/gadget/udc/r8a66597-udc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -832,11 +832,11 @@ static void init_controller(struct r8a66597 *r8a66597)

		r8a66597_bset(r8a66597, XCKE, SYSCFG0);

		msleep(3);
		mdelay(3);

		r8a66597_bset(r8a66597, PLLC, SYSCFG0);

		msleep(1);
		mdelay(1);

		r8a66597_bset(r8a66597, SCKE, SYSCFG0);