Commit e1409354 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Kleber Sacilotto de Souza

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

BugLink: https://bugs.launchpad.net/bugs/1792392

[ Upstream commit 0602088b ]

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: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent a62656a0
...@@ -835,11 +835,11 @@ static void init_controller(struct r8a66597 *r8a66597) ...@@ -835,11 +835,11 @@ static void init_controller(struct r8a66597 *r8a66597)
r8a66597_bset(r8a66597, XCKE, SYSCFG0); r8a66597_bset(r8a66597, XCKE, SYSCFG0);
msleep(3); mdelay(3);
r8a66597_bset(r8a66597, PLLC, SYSCFG0); r8a66597_bset(r8a66597, PLLC, SYSCFG0);
msleep(1); mdelay(1);
r8a66597_bset(r8a66597, SCKE, SYSCFG0); r8a66597_bset(r8a66597, SCKE, SYSCFG0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment