From: Arvind Yadav <arvind.yadav.cs@gmail.com>
Date: Mon, 9 Oct 2017 18:14:48 +0000 (+0200)
Subject: media: imon: Fix null-ptr-deref in imon_probe
X-Git-Tag: archive/raspbian/4.15.4-1+rpi1~1^2^2^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f83c2b56a4c5c62c8ce76e074a0f63fd5bc44f1;p=linux.git

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>

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name media-imon-fix-null-ptr-deref-in-imon_probe.patch
---

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index bd76534a274..9672b696d42 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2516,6 +2516,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) {