* [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor
[not found] <20170921083739.GI3198@localhost>
@ 2017-09-21 8:40 ` Johan Hovold
2017-09-21 14:00 ` Andrey Konovalov
0 siblings, 1 reply; 2+ messages in thread
From: Johan Hovold @ 2017-09-21 8:40 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Andrey Konovalov
Cc: Hans Verkuil, Oleh Kravchenko, linux-media, linux-kernel,
Dmitry Vyukov, Kostya Serebryany, syzkaller, Johan Hovold, stable,
Sri Deevi
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor
2017-09-21 8:40 ` [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor Johan Hovold
@ 2017-09-21 14:00 ` Andrey Konovalov
0 siblings, 0 replies; 2+ messages in thread
From: Andrey Konovalov @ 2017-09-21 14:00 UTC (permalink / raw)
To: Johan Hovold
Cc: Mauro Carvalho Chehab, Hans Verkuil, Oleh Kravchenko, linux-media,
LKML, Dmitry Vyukov, Kostya Serebryany, syzkaller, stable,
Sri Deevi
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-21 14:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20170921083739.GI3198@localhost>
2017-09-21 8:40 ` [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor Johan Hovold
2017-09-21 14:00 ` Andrey Konovalov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).