lkml.org 
[lkml]   [2017]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor
On Thu, Sep 21, 2017 at 10:40 AM, Johan Hovold <johan@kernel.org> wrote:
> 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>

Tested-by: Andrey Konovalov <andreyknvl@google.com>

Thanks!

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

\
 
 \ /
  Last update: 2017-09-21 19:33    [W:0.034 / U:0.628 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site