Skip to content

Commit 0870fb4

Browse files
jhovoldgregkh
authored andcommitted
cx231xx-cards: fix NULL-deref on missing association descriptor
commit 6c3b047fa2d2286d5e438bcb470c7b1a49f415f6 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: e0d3baf ("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>
1 parent d758f4d commit 0870fb4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
16721672
nr = dev->devno;
16731673

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

0 commit comments

Comments
 (0)