Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1736472

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

Show all headers | View raw

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

Fixes: e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver")
Cc: stable <stable@vger.kernel.org>     # 2.6.30
Cc: Sri Deevi <Srinivasa.Deevi@conexant.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index e0daa9b6c2a0..9b742d569fb5 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -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;
-- 
2.14.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe Andrey Konovalov <andreyknvl@google.com> - 2017-09-20 21:00 +0200
  Re: usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe Johan Hovold <johan@kernel.org> - 2017-09-21 10:40 +0200
    [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor Johan Hovold <johan@kernel.org> - 2017-09-21 10:50 +0200
      Re: [PATCH] [media] cx231xx-cards: fix NULL-deref on missing  association descriptor Andrey Konovalov <andreyknvl@google.com> - 2017-09-21 16:10 +0200

csiph-web