Commit 0870fb4c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

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: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Tested-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d758f4d8
...@@ -1672,7 +1672,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, ...@@ -1672,7 +1672,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
nr = dev->devno; nr = dev->devno;
assoc_desc = udev->actconfig->intf_assoc[0]; 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"); dev_err(d, "Not found matching IAD interface\n");
retval = -ENODEV; retval = -ENODEV;
goto err_if; goto err_if;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment