On Thu 2019-05-02 17:21:19, Greg Kroah-Hartman wrote: > [ Upstream commit 41f00e6e9e55546390031996b773e7f3c1d95928 ] > > of_match_device in usb251xb_probe can fail and returns a NULL pointer. > The patch avoids a potential NULL pointer dereference in this scenario. > > Signed-off-by: Aditya Pakki > Reviewed-by: Richard Leitner > Signed-off-by: Greg Kroah-Hartman > Signed-off-by: Sasha Levin (Microsoft) > --- > drivers/usb/misc/usb251xb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c > index a6efb9a72939..5f7734c729b1 100644 > --- a/drivers/usb/misc/usb251xb.c > +++ b/drivers/usb/misc/usb251xb.c > @@ -601,7 +601,7 @@ static int usb251xb_probe(struct usb251xb *hub) > dev); > int err; > > - if (np) { > + if (np && of_id) { > err = usb251xb_get_ofdata(hub, > (struct usb251xb_data *)of_id->data); > if (err) { Are you sure this si correct? If of_id is NULL, this will proceed without setting up hub->conf_data etc. I'd expect it to just return error from probe...? Was this tested? Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html