summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorArvind Yadav <arvind.yadav.cs@gmail.com>2017-10-09 20:14:48 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2017-10-27 17:36:25 +0200
commit58fd55e838276a0c13d1dc7c387f90f25063cbf3 (patch)
tree252d7f73d41299bb449543e904ae3d66d5b6fbb2 /drivers/media/rc
parentbbae615636155fa43a9b0fe0ea31c678984be864 (diff)
downloadlinux-58fd55e838276a0c13d1dc7c387f90f25063cbf3.tar.bz2
media: imon: Fix null-ptr-deref in imon_probe
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>
Diffstat (limited to 'drivers/media/rc')
-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 9724fe8110e3..9fef8cc17114 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2515,6 +2515,11 @@ static int 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) {