* net/gadget: slab-out-of-bounds write in dev_config
@ 2016-12-06 14:29 Andrey Konovalov
2016-12-06 15:30 ` Alan Stern
0 siblings, 1 reply; 6+ messages in thread
From: Andrey Konovalov @ 2016-12-06 14:29 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Al Viro, Marek Szyprowski,
David Sterba, Ryusuke Konishi, David Eccher, Bin Liu,
Mathieu Laurendeau, Binyamin Sharet, Kirill A. Shutemov,
linux-usb, LKML
Cc: Dmitry Vyukov, Kostya Serebryany, syzkaller
Hi!
I've got the following error report while running the syzkaller fuzzer.
ep0_write() doesn't check the length, so a user can cause an
out-of-bounds with both size and data controlled.
There's a comment which says "IN DATA+STATUS caller makes len <=
wLength". While I'm not exactly sure what that means, the length seems
to be passed unmodified directly from dev_config().
This doesn't seem to be a critical security issue since gadgetfs can't
be mounted from a user namespace.
On commit 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 (Dec 2).
==================================================================
BUG: KASAN: slab-out-of-bounds in dev_config+0x86f/0x1190 at addr
ffff88003c47e160
Write of size 65537 by task syz-executor0/6356
CPU: 3 PID: 6356 Comm: syz-executor0 Not tainted 4.9.0-rc7+ #19
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
ffff88003c107ad8 ffffffff81f96aba ffffffff3dc11ef0 1ffff10007820eee
ffffed0007820ee6 ffff88003dc11f00 0000000041b58ab3 ffffffff8598b4c8
ffffffff81f96828 ffffffff813fb4a0 ffff88003b6eadc0 ffff88003c107738
Call Trace:
[< inline >] __dump_stack lib/dump_stack.c:15
[<ffffffff81f96aba>] dump_stack+0x292/0x398 lib/dump_stack.c:51
[<ffffffff817e4dec>] kasan_object_err+0x1c/0x70 mm/kasan/report.c:159
[< inline >] print_address_description mm/kasan/report.c:197
[<ffffffff817e5080>] kasan_report_error+0x1f0/0x4e0 mm/kasan/report.c:286
[<ffffffff817e5705>] kasan_report+0x35/0x40 mm/kasan/report.c:306
[< inline >] check_memory_region_inline mm/kasan/kasan.c:308
[<ffffffff817e3fb9>] check_memory_region+0x139/0x190 mm/kasan/kasan.c:315
[<ffffffff817e4044>] kasan_check_write+0x14/0x20 mm/kasan/kasan.c:326
[< inline >] copy_from_user arch/x86/include/asm/uaccess.h:689
[< inline >] ep0_write drivers/usb/gadget/legacy/inode.c:1135
[<ffffffff83228caf>] dev_config+0x86f/0x1190
drivers/usb/gadget/legacy/inode.c:1759
[<ffffffff817fdd55>] __vfs_write+0x5d5/0x760 fs/read_write.c:510
[<ffffffff817ff650>] vfs_write+0x170/0x4e0 fs/read_write.c:560
[< inline >] SYSC_write fs/read_write.c:607
[<ffffffff81803a5b>] SyS_write+0xfb/0x230 fs/read_write.c:599
[<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
Object at ffff88003c47e038, in cache kmalloc-1024 size: 1024
Allocated:
PID = 4565
[ 43.417154] [<ffffffff81203526>] save_stack_trace+0x16/0x20
arch/x86/kernel/stacktrace.c:57
[ 43.417154] [<ffffffff817e40d3>] save_stack+0x43/0xd0 mm/kasan/kasan.c:495
[ 43.417154] [< inline >] set_track mm/kasan/kasan.c:507
[ 43.417154] [<ffffffff817e435d>] kasan_kmalloc+0xad/0xe0
mm/kasan/kasan.c:598
[ 43.417154] [<ffffffff817dfa02>] kmem_cache_alloc_trace+0x82/0x270
mm/slub.c:2735
[ 43.417154] [< inline >] kmalloc include/linux/slab.h:490
[ 43.417154] [< inline >] kzalloc include/linux/slab.h:636
[ 43.417154] [< inline >] dev_new
drivers/usb/gadget/legacy/inode.c:170
[ 43.417154] [<ffffffff832276ca>] gadgetfs_fill_super+0x24a/0x540
drivers/usb/gadget/legacy/inode.c:1987
[ 43.417154] [<ffffffff8180bb61>] mount_single+0xf1/0x160 fs/super.c:1146
[ 43.417154] [<ffffffff8322290c>] gadgetfs_mount+0x2c/0x40
drivers/usb/gadget/legacy/inode.c:2013
[ 43.417154] [<ffffffff8180be87>] mount_fs+0x97/0x2e0 fs/super.c:1177
[ 43.417154] [<ffffffff8187fc47>] vfs_kern_mount.part.24+0x67/0x2f0
fs/namespace.c:954
[ 43.417154] [< inline >] vfs_kern_mount fs/namespace.c:2433
[ 43.417154] [< inline >] do_new_mount fs/namespace.c:2436
[ 43.417154] [<ffffffff81888f58>] do_mount+0x418/0x2da0 fs/namespace.c:2758
[ 43.417154] [< inline >] SYSC_mount fs/namespace.c:2974
[ 43.417154] [<ffffffff8188c2ab>] SyS_mount+0xab/0x120 fs/namespace.c:2951
[ 43.417154] [<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
Freed:
PID = 0
(stack is not available)
Memory state around the buggy address:
ffff88003c47e100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff88003c47e180: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffff88003c47e200: 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc fc
^
ffff88003c47e280: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88003c47e300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: net/gadget: slab-out-of-bounds write in dev_config
2016-12-06 14:29 net/gadget: slab-out-of-bounds write in dev_config Andrey Konovalov
@ 2016-12-06 15:30 ` Alan Stern
2016-12-06 20:23 ` Andrey Konovalov
2016-12-27 11:21 ` Felipe Balbi
0 siblings, 2 replies; 6+ messages in thread
From: Alan Stern @ 2016-12-06 15:30 UTC (permalink / raw)
To: Andrey Konovalov
Cc: Felipe Balbi, Greg Kroah-Hartman, Al Viro, Marek Szyprowski,
David Sterba, Ryusuke Konishi, David Eccher, Bin Liu,
Mathieu Laurendeau, Binyamin Sharet, Kirill A. Shutemov,
linux-usb, LKML, Dmitry Vyukov, Kostya Serebryany, syzkaller
On Tue, 6 Dec 2016, Andrey Konovalov wrote:
> Hi!
>
> I've got the following error report while running the syzkaller fuzzer.
>
> ep0_write() doesn't check the length, so a user can cause an
> out-of-bounds with both size and data controlled.
> There's a comment which says "IN DATA+STATUS caller makes len <=
> wLength". While I'm not exactly sure what that means, the length seems
> to be passed unmodified directly from dev_config().
You're right about the comment being misleading. It looks like
somebody forgot to actually do the check.
> This doesn't seem to be a critical security issue since gadgetfs can't
> be mounted from a user namespace.
>
> On commit 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 (Dec 2).
>
> ==================================================================
> BUG: KASAN: slab-out-of-bounds in dev_config+0x86f/0x1190 at addr
> ffff88003c47e160
> Write of size 65537 by task syz-executor0/6356
> CPU: 3 PID: 6356 Comm: syz-executor0 Not tainted 4.9.0-rc7+ #19
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
> ffff88003c107ad8 ffffffff81f96aba ffffffff3dc11ef0 1ffff10007820eee
> ffffed0007820ee6 ffff88003dc11f00 0000000041b58ab3 ffffffff8598b4c8
> ffffffff81f96828 ffffffff813fb4a0 ffff88003b6eadc0 ffff88003c107738
> Call Trace:
> [< inline >] __dump_stack lib/dump_stack.c:15
> [<ffffffff81f96aba>] dump_stack+0x292/0x398 lib/dump_stack.c:51
> [<ffffffff817e4dec>] kasan_object_err+0x1c/0x70 mm/kasan/report.c:159
> [< inline >] print_address_description mm/kasan/report.c:197
> [<ffffffff817e5080>] kasan_report_error+0x1f0/0x4e0 mm/kasan/report.c:286
> [<ffffffff817e5705>] kasan_report+0x35/0x40 mm/kasan/report.c:306
> [< inline >] check_memory_region_inline mm/kasan/kasan.c:308
> [<ffffffff817e3fb9>] check_memory_region+0x139/0x190 mm/kasan/kasan.c:315
> [<ffffffff817e4044>] kasan_check_write+0x14/0x20 mm/kasan/kasan.c:326
> [< inline >] copy_from_user arch/x86/include/asm/uaccess.h:689
> [< inline >] ep0_write drivers/usb/gadget/legacy/inode.c:1135
> [<ffffffff83228caf>] dev_config+0x86f/0x1190
> drivers/usb/gadget/legacy/inode.c:1759
> [<ffffffff817fdd55>] __vfs_write+0x5d5/0x760 fs/read_write.c:510
> [<ffffffff817ff650>] vfs_write+0x170/0x4e0 fs/read_write.c:560
> [< inline >] SYSC_write fs/read_write.c:607
> [<ffffffff81803a5b>] SyS_write+0xfb/0x230 fs/read_write.c:599
> [<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
How does this patch work out?
Alan Stern
Index: usb-4.x/drivers/usb/gadget/legacy/inode.c
===================================================================
--- usb-4.x.orig/drivers/usb/gadget/legacy/inode.c
+++ usb-4.x/drivers/usb/gadget/legacy/inode.c
@@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char _
/* data and/or status stage for control request */
} else if (dev->state == STATE_DEV_SETUP) {
- /* IN DATA+STATUS caller makes len <= wLength */
+ len = min(len, (size_t) dev->setup_wLength);
if (dev->setup_in) {
retval = setup_req (dev->gadget->ep0, dev->req, len);
if (retval == 0) {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: net/gadget: slab-out-of-bounds write in dev_config
2016-12-06 15:30 ` Alan Stern
@ 2016-12-06 20:23 ` Andrey Konovalov
2016-12-27 11:21 ` Felipe Balbi
1 sibling, 0 replies; 6+ messages in thread
From: Andrey Konovalov @ 2016-12-06 20:23 UTC (permalink / raw)
To: syzkaller
Cc: Felipe Balbi, Greg Kroah-Hartman, Al Viro, Marek Szyprowski,
David Sterba, Ryusuke Konishi, David Eccher, Bin Liu,
Mathieu Laurendeau, Binyamin Sharet, Kirill A. Shutemov,
linux-usb, LKML, Dmitry Vyukov, Kostya Serebryany
On Tue, Dec 6, 2016 at 4:30 PM, Alan Stern <stern@rowland.harvard.edu> wrote:
> On Tue, 6 Dec 2016, Andrey Konovalov wrote:
>
>> Hi!
>>
>> I've got the following error report while running the syzkaller fuzzer.
>>
>> ep0_write() doesn't check the length, so a user can cause an
>> out-of-bounds with both size and data controlled.
>> There's a comment which says "IN DATA+STATUS caller makes len <=
>> wLength". While I'm not exactly sure what that means, the length seems
>> to be passed unmodified directly from dev_config().
>
> You're right about the comment being misleading. It looks like
> somebody forgot to actually do the check.
>
>> This doesn't seem to be a critical security issue since gadgetfs can't
>> be mounted from a user namespace.
>>
>> On commit 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 (Dec 2).
>>
>> ==================================================================
>> BUG: KASAN: slab-out-of-bounds in dev_config+0x86f/0x1190 at addr
>> ffff88003c47e160
>> Write of size 65537 by task syz-executor0/6356
>> CPU: 3 PID: 6356 Comm: syz-executor0 Not tainted 4.9.0-rc7+ #19
>> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
>> ffff88003c107ad8 ffffffff81f96aba ffffffff3dc11ef0 1ffff10007820eee
>> ffffed0007820ee6 ffff88003dc11f00 0000000041b58ab3 ffffffff8598b4c8
>> ffffffff81f96828 ffffffff813fb4a0 ffff88003b6eadc0 ffff88003c107738
>> Call Trace:
>> [< inline >] __dump_stack lib/dump_stack.c:15
>> [<ffffffff81f96aba>] dump_stack+0x292/0x398 lib/dump_stack.c:51
>> [<ffffffff817e4dec>] kasan_object_err+0x1c/0x70 mm/kasan/report.c:159
>> [< inline >] print_address_description mm/kasan/report.c:197
>> [<ffffffff817e5080>] kasan_report_error+0x1f0/0x4e0 mm/kasan/report.c:286
>> [<ffffffff817e5705>] kasan_report+0x35/0x40 mm/kasan/report.c:306
>> [< inline >] check_memory_region_inline mm/kasan/kasan.c:308
>> [<ffffffff817e3fb9>] check_memory_region+0x139/0x190 mm/kasan/kasan.c:315
>> [<ffffffff817e4044>] kasan_check_write+0x14/0x20 mm/kasan/kasan.c:326
>> [< inline >] copy_from_user arch/x86/include/asm/uaccess.h:689
>> [< inline >] ep0_write drivers/usb/gadget/legacy/inode.c:1135
>> [<ffffffff83228caf>] dev_config+0x86f/0x1190
>> drivers/usb/gadget/legacy/inode.c:1759
>> [<ffffffff817fdd55>] __vfs_write+0x5d5/0x760 fs/read_write.c:510
>> [<ffffffff817ff650>] vfs_write+0x170/0x4e0 fs/read_write.c:560
>> [< inline >] SYSC_write fs/read_write.c:607
>> [<ffffffff81803a5b>] SyS_write+0xfb/0x230 fs/read_write.c:599
>> [<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
>
> How does this patch work out?
I believe it fixes the issue.
Thanks!
>
> Alan Stern
>
>
>
> Index: usb-4.x/drivers/usb/gadget/legacy/inode.c
> ===================================================================
> --- usb-4.x.orig/drivers/usb/gadget/legacy/inode.c
> +++ usb-4.x/drivers/usb/gadget/legacy/inode.c
> @@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char _
> /* data and/or status stage for control request */
> } else if (dev->state == STATE_DEV_SETUP) {
>
> - /* IN DATA+STATUS caller makes len <= wLength */
> + len = min(len, (size_t) dev->setup_wLength);
> if (dev->setup_in) {
> retval = setup_req (dev->gadget->ep0, dev->req, len);
> if (retval == 0) {
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: net/gadget: slab-out-of-bounds write in dev_config
2016-12-06 15:30 ` Alan Stern
2016-12-06 20:23 ` Andrey Konovalov
@ 2016-12-27 11:21 ` Felipe Balbi
2016-12-27 15:12 ` Alan Stern
1 sibling, 1 reply; 6+ messages in thread
From: Felipe Balbi @ 2016-12-27 11:21 UTC (permalink / raw)
To: Alan Stern, Andrey Konovalov
Cc: Greg Kroah-Hartman, Al Viro, Marek Szyprowski, David Sterba,
Ryusuke Konishi, David Eccher, Bin Liu, Mathieu Laurendeau,
Binyamin Sharet, Kirill A. Shutemov, linux-usb, LKML,
Dmitry Vyukov, Kostya Serebryany, syzkaller
[-- Attachment #1: Type: text/plain, Size: 3519 bytes --]
Hi,
Alan Stern <stern@rowland.harvard.edu> writes:
> On Tue, 6 Dec 2016, Andrey Konovalov wrote:
>
>> Hi!
>>
>> I've got the following error report while running the syzkaller fuzzer.
>>
>> ep0_write() doesn't check the length, so a user can cause an
>> out-of-bounds with both size and data controlled.
>> There's a comment which says "IN DATA+STATUS caller makes len <=
>> wLength". While I'm not exactly sure what that means, the length seems
>> to be passed unmodified directly from dev_config().
>
> You're right about the comment being misleading. It looks like
> somebody forgot to actually do the check.
>
>> This doesn't seem to be a critical security issue since gadgetfs can't
>> be mounted from a user namespace.
>>
>> On commit 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 (Dec 2).
>>
>> ==================================================================
>> BUG: KASAN: slab-out-of-bounds in dev_config+0x86f/0x1190 at addr
>> ffff88003c47e160
>> Write of size 65537 by task syz-executor0/6356
>> CPU: 3 PID: 6356 Comm: syz-executor0 Not tainted 4.9.0-rc7+ #19
>> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
>> ffff88003c107ad8 ffffffff81f96aba ffffffff3dc11ef0 1ffff10007820eee
>> ffffed0007820ee6 ffff88003dc11f00 0000000041b58ab3 ffffffff8598b4c8
>> ffffffff81f96828 ffffffff813fb4a0 ffff88003b6eadc0 ffff88003c107738
>> Call Trace:
>> [< inline >] __dump_stack lib/dump_stack.c:15
>> [<ffffffff81f96aba>] dump_stack+0x292/0x398 lib/dump_stack.c:51
>> [<ffffffff817e4dec>] kasan_object_err+0x1c/0x70 mm/kasan/report.c:159
>> [< inline >] print_address_description mm/kasan/report.c:197
>> [<ffffffff817e5080>] kasan_report_error+0x1f0/0x4e0 mm/kasan/report.c:286
>> [<ffffffff817e5705>] kasan_report+0x35/0x40 mm/kasan/report.c:306
>> [< inline >] check_memory_region_inline mm/kasan/kasan.c:308
>> [<ffffffff817e3fb9>] check_memory_region+0x139/0x190 mm/kasan/kasan.c:315
>> [<ffffffff817e4044>] kasan_check_write+0x14/0x20 mm/kasan/kasan.c:326
>> [< inline >] copy_from_user arch/x86/include/asm/uaccess.h:689
>> [< inline >] ep0_write drivers/usb/gadget/legacy/inode.c:1135
>> [<ffffffff83228caf>] dev_config+0x86f/0x1190
>> drivers/usb/gadget/legacy/inode.c:1759
>> [<ffffffff817fdd55>] __vfs_write+0x5d5/0x760 fs/read_write.c:510
>> [<ffffffff817ff650>] vfs_write+0x170/0x4e0 fs/read_write.c:560
>> [< inline >] SYSC_write fs/read_write.c:607
>> [<ffffffff81803a5b>] SyS_write+0xfb/0x230 fs/read_write.c:599
>> [<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
>
> How does this patch work out?
>
> Alan Stern
>
>
>
> Index: usb-4.x/drivers/usb/gadget/legacy/inode.c
> ===================================================================
> --- usb-4.x.orig/drivers/usb/gadget/legacy/inode.c
> +++ usb-4.x/drivers/usb/gadget/legacy/inode.c
> @@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char _
> /* data and/or status stage for control request */
> } else if (dev->state == STATE_DEV_SETUP) {
>
> - /* IN DATA+STATUS caller makes len <= wLength */
> + len = min(len, (size_t) dev->setup_wLength);
> if (dev->setup_in) {
> retval = setup_req (dev->gadget->ep0, dev->req, len);
> if (retval == 0) {
>
I already have a patch from Greg for this. See [1]
[1] https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?id=230bc0cb8ff222d9f0fbbd93a80393140b39481f
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: net/gadget: slab-out-of-bounds write in dev_config
2016-12-27 11:21 ` Felipe Balbi
@ 2016-12-27 15:12 ` Alan Stern
2016-12-28 11:51 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Alan Stern @ 2016-12-27 15:12 UTC (permalink / raw)
To: Felipe Balbi
Cc: Andrey Konovalov, Greg Kroah-Hartman, Al Viro, Marek Szyprowski,
David Sterba, Ryusuke Konishi, David Eccher, Bin Liu,
Mathieu Laurendeau, Binyamin Sharet, Kirill A. Shutemov,
linux-usb, LKML, Dmitry Vyukov, Kostya Serebryany, syzkaller
On Tue, 27 Dec 2016, Felipe Balbi wrote:
>
> Hi,
>
> Alan Stern <stern@rowland.harvard.edu> writes:
> > On Tue, 6 Dec 2016, Andrey Konovalov wrote:
> >
> >> Hi!
> >>
> >> I've got the following error report while running the syzkaller fuzzer.
> >>
> >> ep0_write() doesn't check the length, so a user can cause an
> >> out-of-bounds with both size and data controlled.
> >> There's a comment which says "IN DATA+STATUS caller makes len <=
> >> wLength". While I'm not exactly sure what that means, the length seems
> >> to be passed unmodified directly from dev_config().
> >
> > You're right about the comment being misleading. It looks like
> > somebody forgot to actually do the check.
> >
> >> This doesn't seem to be a critical security issue since gadgetfs can't
> >> be mounted from a user namespace.
> >>
> >> On commit 3c49de52d5647cda8b42c4255cf8a29d1e22eff5 (Dec 2).
> >>
> >> ==================================================================
> >> BUG: KASAN: slab-out-of-bounds in dev_config+0x86f/0x1190 at addr
> >> ffff88003c47e160
> >> Write of size 65537 by task syz-executor0/6356
> >> CPU: 3 PID: 6356 Comm: syz-executor0 Not tainted 4.9.0-rc7+ #19
> >> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
> >> ffff88003c107ad8 ffffffff81f96aba ffffffff3dc11ef0 1ffff10007820eee
> >> ffffed0007820ee6 ffff88003dc11f00 0000000041b58ab3 ffffffff8598b4c8
> >> ffffffff81f96828 ffffffff813fb4a0 ffff88003b6eadc0 ffff88003c107738
> >> Call Trace:
> >> [< inline >] __dump_stack lib/dump_stack.c:15
> >> [<ffffffff81f96aba>] dump_stack+0x292/0x398 lib/dump_stack.c:51
> >> [<ffffffff817e4dec>] kasan_object_err+0x1c/0x70 mm/kasan/report.c:159
> >> [< inline >] print_address_description mm/kasan/report.c:197
> >> [<ffffffff817e5080>] kasan_report_error+0x1f0/0x4e0 mm/kasan/report.c:286
> >> [<ffffffff817e5705>] kasan_report+0x35/0x40 mm/kasan/report.c:306
> >> [< inline >] check_memory_region_inline mm/kasan/kasan.c:308
> >> [<ffffffff817e3fb9>] check_memory_region+0x139/0x190 mm/kasan/kasan.c:315
> >> [<ffffffff817e4044>] kasan_check_write+0x14/0x20 mm/kasan/kasan.c:326
> >> [< inline >] copy_from_user arch/x86/include/asm/uaccess.h:689
> >> [< inline >] ep0_write drivers/usb/gadget/legacy/inode.c:1135
> >> [<ffffffff83228caf>] dev_config+0x86f/0x1190
> >> drivers/usb/gadget/legacy/inode.c:1759
> >> [<ffffffff817fdd55>] __vfs_write+0x5d5/0x760 fs/read_write.c:510
> >> [<ffffffff817ff650>] vfs_write+0x170/0x4e0 fs/read_write.c:560
> >> [< inline >] SYSC_write fs/read_write.c:607
> >> [<ffffffff81803a5b>] SyS_write+0xfb/0x230 fs/read_write.c:599
> >> [<ffffffff84f47ec1>] entry_SYSCALL_64_fastpath+0x1f/0xc2
> >
> > How does this patch work out?
> >
> > Alan Stern
> >
> >
> >
> > Index: usb-4.x/drivers/usb/gadget/legacy/inode.c
> > ===================================================================
> > --- usb-4.x.orig/drivers/usb/gadget/legacy/inode.c
> > +++ usb-4.x/drivers/usb/gadget/legacy/inode.c
> > @@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char _
> > /* data and/or status stage for control request */
> > } else if (dev->state == STATE_DEV_SETUP) {
> >
> > - /* IN DATA+STATUS caller makes len <= wLength */
> > + len = min(len, (size_t) dev->setup_wLength);
> > if (dev->setup_in) {
> > retval = setup_req (dev->gadget->ep0, dev->req, len);
> > if (retval == 0) {
> >
>
> I already have a patch from Greg for this. See [1]
>
> [1] https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?id=230bc0cb8ff222d9f0fbbd93a80393140b39481f
The two patches fix different problems. My patch goes on the pathway
where dev->state > STATE_DEV_OPENED in dev_config(), and Greg's patch
handles the case where it is <=.
Alan Stern
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: net/gadget: slab-out-of-bounds write in dev_config
2016-12-27 15:12 ` Alan Stern
@ 2016-12-28 11:51 ` Felipe Balbi
0 siblings, 0 replies; 6+ messages in thread
From: Felipe Balbi @ 2016-12-28 11:51 UTC (permalink / raw)
To: Alan Stern
Cc: Andrey Konovalov, Greg Kroah-Hartman, Al Viro, Marek Szyprowski,
David Sterba, Ryusuke Konishi, David Eccher, Bin Liu,
Mathieu Laurendeau, Binyamin Sharet, Kirill A. Shutemov,
linux-usb, LKML, Dmitry Vyukov, Kostya Serebryany, syzkaller
[-- Attachment #1: Type: text/plain, Size: 2960 bytes --]
Hi,
Alan Stern <stern@rowland.harvard.edu> writes:
>> > Index: usb-4.x/drivers/usb/gadget/legacy/inode.c
>> > ===================================================================
>> > --- usb-4.x.orig/drivers/usb/gadget/legacy/inode.c
>> > +++ usb-4.x/drivers/usb/gadget/legacy/inode.c
>> > @@ -1126,7 +1126,7 @@ ep0_write (struct file *fd, const char _
>> > /* data and/or status stage for control request */
>> > } else if (dev->state == STATE_DEV_SETUP) {
>> >
>> > - /* IN DATA+STATUS caller makes len <= wLength */
>> > + len = min(len, (size_t) dev->setup_wLength);
>> > if (dev->setup_in) {
>> > retval = setup_req (dev->gadget->ep0, dev->req, len);
>> > if (retval == 0) {
>> >
>>
>> I already have a patch from Greg for this. See [1]
>>
>> [1] https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?id=230bc0cb8ff222d9f0fbbd93a80393140b39481f
>
> The two patches fix different problems. My patch goes on the pathway
> where dev->state > STATE_DEV_OPENED in dev_config(), and Greg's patch
> handles the case where it is <=.
Okay, here's what I have so far in my testing/fixes:
$ git --no-pager shortlog testing/fixes ^linus/master
Alan Stern (5):
USB: dummy-hcd: fix bug in stop_activity (handle ep0)
USB: gadgetfs: fix unbounded memory allocation bug
USB: gadgetfs: fix use-after-free bug
USB: gadgetfs: fix checks of wTotalLength in config descriptors
USB: gadgetfs: remove unnecessary assignment
Baolin Wang (1):
usb: gadget: f_fs: Fix possibe deadlock
Felipe Balbi (4):
usb: dwc3: ep0: add dwc3_ep0_prepare_one_trb()
usb: dwc3: ep0: explicitly call dwc3_ep0_prepare_one_trb()
usb: dwc3: gadget: always unmap EP0 requests
usb: dwc3: core: avoid Overflow events
Greg Kroah-Hartman (1):
usb: gadgetfs: restrict upper bound on device configuration size
Grygorii Strashko (1):
usb: dwc3: omap: fix race of pm runtime with irq handler in probe
Hans de Goede (1):
usb: dwc3: pci: Fix dr_mode misspelling
Heikki Krogerus (1):
usb: dwc3: pci: add Intel Gemini Lake PCI ID
Janusz Dziedzic (1):
usb: dwc3: skip interrupt when ep disabled
John Youn (1):
usb: dwc3: pci: Add "linux,sysdev_is_parent" property
Krzysztof Opasiak (1):
usb: gadget: composite: Test get_alt() presence instead of set_alt()
Marek Szyprowski (1):
usb: dwc2: fix flags for DMA descriptor allocation in dwc2_hsotg_ep_enable
Stefan Wahren (4):
usb: dwc2: Do not set host parameter in peripheral mode
usb: dwc2: fix dwc2_get_device_property for u8 and u16
usb: dwc2: fix default value for DMA support
usb: dwc2: gadget: fix default value for gadget-dma-desc
Vincent Pelletier (2):
usb: gadget: f_fs: Document eventfd effect on descriptor format.
usb: gadget: f_fs: Fix ExtCompat descriptor validation
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-12-28 11:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-06 14:29 net/gadget: slab-out-of-bounds write in dev_config Andrey Konovalov
2016-12-06 15:30 ` Alan Stern
2016-12-06 20:23 ` Andrey Konovalov
2016-12-27 11:21 ` Felipe Balbi
2016-12-27 15:12 ` Alan Stern
2016-12-28 11:51 ` Felipe Balbi
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).