Commit c80ad6d1 authored by Kevin Hilman's avatar Kevin Hilman Committed by Greg Kroah-Hartman

USB: OHCI: ohci_init_driver(): sanity check overrides

Check for non-NULL overrides before dereferencing since platforms may
pass in NULL overrides.
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14e1d2df
...@@ -1161,10 +1161,12 @@ void ohci_init_driver(struct hc_driver *drv, ...@@ -1161,10 +1161,12 @@ void ohci_init_driver(struct hc_driver *drv,
/* Copy the generic table to drv and then apply the overrides */ /* Copy the generic table to drv and then apply the overrides */
*drv = ohci_hc_driver; *drv = ohci_hc_driver;
drv->product_desc = over->product_desc; if (over) {
drv->hcd_priv_size += over->extra_priv_size; drv->product_desc = over->product_desc;
if (over->reset) drv->hcd_priv_size += over->extra_priv_size;
drv->reset = over->reset; if (over->reset)
drv->reset = over->reset;
}
} }
EXPORT_SYMBOL_GPL(ohci_init_driver); EXPORT_SYMBOL_GPL(ohci_init_driver);
......
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