Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c3b047f authored by Johan Hovold's avatar Johan Hovold Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx-cards: fix NULL-deref on missing association descriptor 



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")

Cc: stable <stable@vger.kernel.org>     # 2.6.30
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>
parent d17dd2db

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1684,7 +1684,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;