summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2019-05-19 15:28:22 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-05-22 15:29:14 -0400
commit6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230 (patch)
treeff40bce3b5aa800345e605bf22cf01940567dcdb /drivers/media/usb
parent6cf97230cd5f36b7665099083272595c55d72be7 (diff)
downloadlinux-6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230.tar.gz
linux-6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230.tar.bz2
linux-6d0d1ff9ff21fbb06b867c13a1d41ce8ddcd8230.zip
media: au0828: fix null dereference in error path
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>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/au0828/au0828-core.c12
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 925a80437822..e306d5d5bebb 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -729,6 +729,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) {
@@ -747,12 +753,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);