AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

usb: host: fotg2: Fix potential NULL dereference

Browse Source 
There is code in the .remove() hook to handle the drvdata
being NULL, for good reasons: it is never set, so it will
always be NULL. As I moved code around, static checkers
start complaining.

Instead of this, make sure to always set it on successful
probe so we can always dereference it on the remove path.

Use the platform_device_[set|get]_drvdata() since this is
a platform device.

Fixes: ffa8a31b5b ("usb: host: fotg2: add silicon clock handling")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Linus Walleij 2018-09-18 16:25:06 -07:00 committed by Greg Kroah-Hartman
parent 3df0e240ca
commit 46216506ce
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/fotg210-hcd.c
View File

@ -5636,6 +5636,7 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
goto failed_dis_clk; goto failed_dis_clk;
} }
device_wakeup_enable(hcd->self.controller); device_wakeup_enable(hcd->self.controller);
platform_set_drvdata(pdev, hcd);
return retval; return retval;
@ -5656,16 +5657,12 @@ static int fotg210_hcd_probe(struct platform_device *pdev)
*/ */
static int fotg210_hcd_remove(struct platform_device *pdev) static int fotg210_hcd_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd); struct fotg210_hcd *fotg210 = hcd_to_fotg210(hcd);
if (!IS_ERR(fotg210->pclk)) if (!IS_ERR(fotg210->pclk))
clk_disable_unprepare(fotg210->pclk); clk_disable_unprepare(fotg210->pclk);
if (!hcd)
return 0;
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
usb_put_hcd(hcd); usb_put_hcd(hcd);