lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 082/138] [media] cx231xx-cards: fix NULL-deref on missing association descriptor
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    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: e0d3bafd0258 ("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>

    ---
    drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
    +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
    @@ -1622,7 +1622,7 @@ static int cx231xx_usb_probe(struct usb_
    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;

    \
     
     \ /
      Last update: 2017-11-28 12:56    [W:2.198 / U:0.720 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site