diff options
| author | Arvind Yadav <arvind.yadav.cs@gmail.com> | 2017-10-09 20:14:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:49:20 +0100 |
| commit | 16edf1a6a8a52040841e3e875c76bad0aa28f85f (patch) | |
| tree | df40372e12664d9d6ddefa03d0cf756073d839ba | |
| parent | 34c45c1ee883d080f2fc9a668714ae317c952f6b (diff) | |
| download | linux-stable-16edf1a6a8a52040841e3e875c76bad0aa28f85f.tar.gz linux-stable-16edf1a6a8a52040841e3e875c76bad0aa28f85f.tar.bz2 linux-stable-16edf1a6a8a52040841e3e875c76bad0aa28f85f.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>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/rc/imon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 7b3f31cc63d2..0c46155a8e9d 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -2517,6 +2517,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) { |