* usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe
@ 2017-09-20 18:54 Andrey Konovalov
2017-09-21 8:37 ` Johan Hovold
0 siblings, 1 reply; 4+ messages in thread
From: Andrey Konovalov @ 2017-09-20 18:54 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Oleh Kravchenko, Hans Verkuil,
Johan Hovold, linux-media, LKML
Cc: Dmitry Vyukov, Kostya Serebryany, syzkaller
Hi!
I've got the following report while fuzzing the kernel with syzkaller.
On commit ebb2c2437d8008d46796902ff390653822af6cc4 (Sep 18).
The null-ptr-deref happens on assoc_desc->bFirstInterface, where
assoc_desc = udev->actconfig->intf_assoc[0]. There seems to be no
check that the device actually contains an Interface Association
Descriptor.
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN
Modules linked in:
CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.14.0-rc1-42251-gebb2c2437d80 #206
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
Workqueue: usb_hub_wq hub_event
task: ffff88006bb26300 task.stack: ffff88006bba0000
RIP: 0010:cx231xx_usb_probe+0x96a/0x32e0
drivers/media/usb/cx231xx/cx231xx-cards.c:1687
RSP: 0018:ffff88006bba63e0 EFLAGS: 00010246
RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 00000000fffff8f8
RDX: 0000000000000000 RSI: ffffffff86876d60 RDI: 0000000000000002
RBP: ffff88006bba65e8 R08: 0000000000000002 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: ffffffff870a62e0
R13: ffff88005ba70028 R14: ffff880062c9aa80 R15: ffff880062c9b018
FS: 0000000000000000(0000) GS:ffff88006c600000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f83211b5518 CR3: 000000005b9dc000 CR4: 00000000000006f0
Call Trace:
usb_probe_interface+0x35d/0x8e0 drivers/usb/core/driver.c:361
really_probe drivers/base/dd.c:413
driver_probe_device+0x610/0xa00 drivers/base/dd.c:557
__device_attach_driver+0x230/0x290 drivers/base/dd.c:653
bus_for_each_drv+0x161/0x210 drivers/base/bus.c:463
__device_attach+0x26e/0x3d0 drivers/base/dd.c:710
device_initial_probe+0x1f/0x30 drivers/base/dd.c:757
bus_probe_device+0x1eb/0x290 drivers/base/bus.c:523
device_add+0xd0b/0x1660 drivers/base/core.c:1835
usb_set_configuration+0x104e/0x1870 drivers/usb/core/message.c:1932
generic_probe+0x73/0xe0 drivers/usb/core/generic.c:174
usb_probe_device+0xaf/0xe0 drivers/usb/core/driver.c:266
really_probe drivers/base/dd.c:413
driver_probe_device+0x610/0xa00 drivers/base/dd.c:557
__device_attach_driver+0x230/0x290 drivers/base/dd.c:653
bus_for_each_drv+0x161/0x210 drivers/base/bus.c:463
__device_attach+0x26e/0x3d0 drivers/base/dd.c:710
device_initial_probe+0x1f/0x30 drivers/base/dd.c:757
bus_probe_device+0x1eb/0x290 drivers/base/bus.c:523
device_add+0xd0b/0x1660 drivers/base/core.c:1835
usb_new_device+0x7b8/0x1020 drivers/usb/core/hub.c:2457
hub_port_connect drivers/usb/core/hub.c:4903
hub_port_connect_change drivers/usb/core/hub.c:5009
port_event drivers/usb/core/hub.c:5115
hub_event+0x194d/0x3740 drivers/usb/core/hub.c:5195
process_one_work+0xc7f/0x1db0 kernel/workqueue.c:2119
worker_thread+0x221/0x1850 kernel/workqueue.c:2253
kthread+0x3a1/0x470 kernel/kthread.c:231
ret_from_fork+0x2a/0x40 arch/x86/entry/entry_64.S:431
Code: 18 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 aa 28 00 00 48 b8 00
00 00 00 00 fc ff df 48 8b 5b 18 48 8d 7b 02 48 89 fa 48 c1 ea 03 <0f>
b6 04 02 48 89 fa 83 e2 07 38 d0 7f 08 84 c0 0f 85 50 28 00
RIP: cx231xx_usb_probe+0x96a/0x32e0 RSP: ffff88006bba63e0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe
2017-09-20 18:54 usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe Andrey Konovalov
@ 2017-09-21 8:37 ` Johan Hovold
2017-09-21 8:40 ` [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor Johan Hovold
0 siblings, 1 reply; 4+ messages in thread
From: Johan Hovold @ 2017-09-21 8:37 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Mauro Carvalho Chehab, Oleh Kravchenko, Hans Verkuil,
Johan Hovold, linux-media, LKML, Dmitry Vyukov, Kostya Serebryany,
syzkaller
On Wed, Sep 20, 2017 at 08:54:08PM +0200, Andrey Konovalov wrote:
> Hi!
>
> I've got the following report while fuzzing the kernel with syzkaller.
>
> On commit ebb2c2437d8008d46796902ff390653822af6cc4 (Sep 18).
>
> The null-ptr-deref happens on assoc_desc->bFirstInterface, where
> assoc_desc = udev->actconfig->intf_assoc[0]. There seems to be no
> check that the device actually contains an Interface Association
> Descriptor.
That is indeed a bug; I'll respond to this mail with a fix.
Thanks,
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] [media] cx231xx-cards: fix NULL-deref on missing association descriptor
2017-09-21 8:37 ` Johan Hovold
@ 2017-09-21 8:40 ` Johan Hovold
2017-09-21 14:00 ` Andrey Konovalov
0 siblings, 1 reply; 4+ 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] 4+ 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; 4+ 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] 4+ messages in thread
end of thread, other threads:[~2017-09-21 14:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-20 18:54 usb/media/cx231xx: null-ptr-deref in cx231xx_usb_probe Andrey Konovalov
2017-09-21 8:37 ` Johan Hovold
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).