OSDN Git Service

media: imon: Fix null-ptr-deref in imon_probe
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Mon, 9 Oct 2017 18:14:48 +0000 (20:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Nov 2017 08:21:17 +0000 (09:21 +0100)
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>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/rc/imon.c

index eb9e7fe..7a16e9e 100644 (file)
@@ -2419,6 +2419,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) {