Commit 5a482b8a authored Sep 21, 2017 by Johan Hovold Committed by Greg Kroah-Hartman Nov 30, 2017

cx231xx-cards: fix NULL-deref on missing association descriptor



commit 6c3b047f upstream.

Make sure to check that we actually have an Interface Association
Descriptor before dereferencing it during probe to avoid dereferencing a
NULL-pointer.

Fixes: e0d3bafd ("V4L/DVB (10954): Add cx231xx USB driver")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cfec97f2

drivers/media/usb/cx231xx/cx231xx-cards.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1684,7 +1684,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
		nr = dev->devno;

		assoc_desc = udev->actconfig->intf_assoc[0];
		if (assoc_desc->bFirstInterface != ifnum) {
		if (!assoc_desc \|\| assoc_desc->bFirstInterface != ifnum) {
		dev_err(d, "Not found matching IAD interface\n");
		retval = -ENODEV;
		goto err_if;