diff options
| author | Sean Young | 2019-05-19 21:28:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-04 09:30:53 +0200 |
| commit | 3cf6a070708895b1f7b1d54a8519ea46fdd4262b (patch) | |
| tree | 9a1fc5244254e0db2d8e603f4f084a78e2066a0f | |
| parent | ISDN: hfcsusb: checking idx of ep configuration (diff) | |
| download | kernel-qcow2-linux-3cf6a070708895b1f7b1d54a8519ea46fdd4262b.tar.gz kernel-qcow2-linux-3cf6a070708895b1f7b1d54a8519ea46fdd4262b.tar.xz kernel-qcow2-linux-3cf6a070708895b1f7b1d54a8519ea46fdd4262b.zip | |
media: au0828: fix null dereference in error path
commit 6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230 upstream.
au0828_usb_disconnect() gets the au0828_dev struct via usb_get_intfdata,
so it needs to set up for the error paths.
Reported-by: syzbot+357d86bcb4cca1a2f572@syzkaller.appspotmail.com
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/usb/au0828/au0828-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 257ae0d8cfe2..e3f63299f85c 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -623,6 +623,12 @@ static int au0828_usb_probe(struct usb_interface *interface, /* Setup */ au0828_card_setup(dev); + /* + * Store the pointer to the au0828_dev so it can be accessed in + * au0828_usb_disconnect + */ + usb_set_intfdata(interface, dev); + /* Analog TV */ retval = au0828_analog_register(dev, interface); if (retval) { @@ -641,12 +647,6 @@ static int au0828_usb_probe(struct usb_interface *interface, /* Remote controller */ au0828_rc_register(dev); - /* - * Store the pointer to the au0828_dev so it can be accessed in - * au0828_usb_disconnect - */ - usb_set_intfdata(interface, dev); - pr_info("Registered device AU0828 [%s]\n", dev->board.name == NULL ? "Unset" : dev->board.name); |