summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArvind Yadav <arvind.yadav.cs@gmail.com>2017-10-09 20:14:48 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-11-26 13:51:11 +0000
commit0df873c63e8e99a8fb6e068d182b860e6e6e07a9 (patch)
treeb1aeb9a610fb79415f0ad8247adb556d86cd7d3f /drivers
parent59a7195cd497d430d9f76bc9f71cf53ed4102743 (diff)
downloadlinux-0df873c63e8e99a8fb6e068d182b860e6e6e07a9.tar.gz
linux-0df873c63e8e99a8fb6e068d182b860e6e6e07a9.tar.bz2
linux-0df873c63e8e99a8fb6e068d182b860e6e6e07a9.zip
media: imon: Fix null-ptr-deref in imon_probe
commit 58fd55e838276a0c13d1dc7c387f90f25063cbf3 upstream. It seems that the return value of usb_ifnum_to_if() can be NULL and needs to be checked. Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/rc/imon.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3f175ebe2766..3fb59496bdab 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2318,6 +2318,11 @@ static int __devinit imon_probe(struct usb_interface *interface,
mutex_lock(&driver_lock);
first_if = usb_ifnum_to_if(usbdev, 0);
+ if (!first_if) {
+ ret = -ENODEV;
+ goto fail;
+ }
+
first_if_ctx = usb_get_intfdata(first_if);
if (ifnum == 0) {