KASAN: use-after-free Write in release_tty
syzbot
syzbotHello,
syzbot found the following crash on:
HEAD commit: 596cf45c Merge branch 'akpm' (patches from Andrew) git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=13dc7aeae00000 kernel config: https://syzkaller.appspot.com/x/.config?x=7d8ab2e0e09c2a82 dashboard link: https://syzkaller.appspot.com/bug?extid=522643ab5729b0421998 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15f5d59ce00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1214042ae00000
Bisection is inconclusive: the bug happens on the oldest tested release.
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=17b01edae00000 final crash: https://syzkaller.appspot.com/x/report.txt?x=14701edae00000 console output: https://syzkaller.appspot.com/x/log.txt?x=10701edae00000
IMPORTANT: if you fix the bug, please add the following tag to the commit:
==================================================================
BUG: KASAN: use-after-free in con_shutdown+0x85/0x90 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88809b797108 by task syz-executor613/9470 CPU: 0 PID: 9470 Comm: syz-executor613 Not tainted 5.4.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x197/0x210 lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xd4/0x30b mm/kasan/report.c:374 __kasan_report.cold+0x1b/0x41 mm/kasan/report.c:506 kasan_report+0x12/0x20 mm/kasan/common.c:638 __asan_report_store8_noabort+0x17/0x20 mm/kasan/generic_report.c:140 con_shutdown+0x85/0x90 drivers/tty/vt/vt.c:3278 release_tty+0xd3/0x470 drivers/tty/tty_io.c:1511 tty_release_struct+0x3c/0x50 drivers/tty/tty_io.c:1626 tty_release+0xbcb/0xe90 drivers/tty/tty_io.c:1786 __fput+0x2ff/0x890 fs/file_table.c:280 ____fput+0x16/0x20 fs/file_table.c:313 task_work_run+0x145/0x1c0 kernel/task_work.c:113 exit_task_work include/linux/task_work.h:22 [inline] do_exit+0x8e7/0x2ef0 kernel/exit.c:797 do_group_exit+0x135/0x360 kernel/exit.c:895 __do_sys_exit_group kernel/exit.c:906 [inline] __se_sys_exit_group kernel/exit.c:904 [inline] __x64_sys_exit_group+0x44/0x50 kernel/exit.c:904 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x443c38 Code: 00 00 be 3c 00 00 00 eb 19 66 0f 1f 84 00 00 00 00 00 48 89 d7 89 f0 0f 05 48 3d 00 f0 ff ff 77 21 f4 48 89 d7 44 89 c0 0f 05 <48> 3d 00 f0 ff ff 76 e0 f7 d8 64 41 89 01 eb d8 0f 1f 84 00 00 00 RSP: 002b:00007ffd7eba55f8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000000000443c38 RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 RBP: 00000000004c37b0 R08: 00000000000000e7 R09: ffffffffffffffd0 R10: 000000000000000f R11: 0000000000000246 R12: 0000000000000001 R13: 00000000006d5180 R14: 0000000000000000 R15: 0000000000000000 Allocated by task 9465: save_stack+0x23/0x90 mm/kasan/common.c:71 set_track mm/kasan/common.c:79 [inline] __kasan_kmalloc mm/kasan/common.c:512 [inline] __kasan_kmalloc.constprop.0+0xcf/0xe0 mm/kasan/common.c:485 kasan_kmalloc+0x9/0x10 mm/kasan/common.c:526 kmem_cache_alloc_trace+0x158/0x790 mm/slab.c:3551 kmalloc include/linux/slab.h:556 [inline] kzalloc include/linux/slab.h:670 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1fc/0x760 drivers/tty/vt/vt.c:1066 con_install+0x52/0x410 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev drivers/tty/tty_io.c:1341 [inline] tty_init_dev+0xf7/0x460 drivers/tty/tty_io.c:1318 tty_open_by_driver drivers/tty/tty_io.c:1985 [inline] tty_open+0x4a5/0xbb0 drivers/tty/tty_io.c:2033 chrdev_open+0x245/0x6b0 fs/char_dev.c:414 do_dentry_open+0x4e6/0x1380 fs/open.c:797 vfs_open+0xa0/0xd0 fs/open.c:914 do_last fs/namei.c:3412 [inline] path_openat+0x10e4/0x4710 fs/namei.c:3529 do_filp_open+0x1a1/0x280 fs/namei.c:3559 do_sys_open+0x3fe/0x5d0 fs/open.c:1097 __do_sys_open fs/open.c:1115 [inline] __se_sys_open fs/open.c:1110 [inline] __x64_sys_open+0x7e/0xc0 fs/open.c:1110 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 9471: save_stack+0x23/0x90 mm/kasan/common.c:71 set_track mm/kasan/common.c:79 [inline] kasan_set_free_info mm/kasan/common.c:334 [inline] __kasan_slab_free+0x102/0x150 mm/kasan/common.c:473 kasan_slab_free+0xe/0x10 mm/kasan/common.c:482 __cache_free mm/slab.c:3426 [inline] kfree+0x10a/0x2c0 mm/slab.c:3757 vt_disallocate_all+0x2bd/0x3e0 drivers/tty/vt/vt_ioctl.c:323 vt_ioctl+0xc38/0x26d0 drivers/tty/vt/vt_ioctl.c:816 tty_ioctl+0xa37/0x14f0 drivers/tty/tty_io.c:2658 vfs_ioctl fs/ioctl.c:47 [inline] file_ioctl fs/ioctl.c:539 [inline] do_vfs_ioctl+0xdb6/0x13e0 fs/ioctl.c:726 ksys_ioctl+0xab/0xd0 fs/ioctl.c:743 __do_sys_ioctl fs/ioctl.c:750 [inline] __se_sys_ioctl fs/ioctl.c:748 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:748 do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294 entry_SYSCALL_64_after_hwframe+0x49/0xbe The buggy address belongs to the object at ffff88809b797000 which belongs to the cache kmalloc-2k of size 2048 The buggy address is located 264 bytes inside of 2048-byte region [ffff88809b797000, ffff88809b797800) The buggy address belongs to the page: page:ffffea00026de5c0 refcount:1 mapcount:0 mapping:ffff8880aa400e00 index:0x0 raw: 00fffe0000000200 ffffea00025c8248 ffffea00023a9a88 ffff8880aa400e00 raw: 0000000000000000 ffff88809b797000 0000000100000001 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff88809b797000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88809b797080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
Quoted 1 line
ffff88809b797100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88809b797180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88809b797200: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================
---
This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at [email protected].
syzbot will keep track of this bug report. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection
syzbot can test patches for this bug, for details see:
https://goo.gl/tpsmEJ#testing-patches
PATCH 1/1 vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
From: Eric Biggers <[email protected]>
The VT_DISALLOCATE ioctl can free a virtual console while tty_release() is still running, causing a use-after-free in con_shutdown(). This occurs because VT_DISALLOCATE only considers a virtual console to be in-use if it has a tty_struct with count > 0. But actually when count == 0, the tty is still in the process of being closed.
Fix this by treating a virtual console as in-use if it has a tty_struct at all, even with zero count; and by making VT_DISALLOCATE take the tty_mutex in order to provide synchronization with release_tty().
Reproducer:
#include <fcntl.h>
#include <linux/vt.h>
#include <sys/ioctl.h>
#include <unistd.h>
int main()
{
if (fork()) {
for (;;)
close(open("/dev/tty5", O_RDWR));
} else {
int fd = open("/dev/tty10", O_RDWR);
for (;;)
ioctl(fd, VT_DISALLOCATE, 5);
}
}KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...]
--- drivers/tty/vt/vt_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/vt/vt_ioctl.c +5 -1
@@ -42,7 +42,7 @@char vt_dont_switch;extern struct tty_driver *console_driver; -#define VT_IS_IN_USE (i) (console_driver->ttys[i] && console_driver->ttys[i]->count) +#define VT_IS_IN_USE (i) (console_driver->ttys[i] != NULL)#define VT_BUSY (i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)/*
@@ -288,12 +288,14 @@ static int vt_disallocate(unsigned int vc_num)struct vc_data *vc =NULL ;int ret =0 ; +mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();if (VT_BUSY (vc_num)) ret = -EBUSY ;else if (vc_num) vc =vc_deallocate (vc_num);console_unlock (); +mutex_unlock (&tty_mutex);if (vc && vc_num >=MIN_NR_CONSOLES ) {tty_port_destroy (&vc->port);
@@ -309,6 +311,7 @@ static void vt_disallocate_all(void)struct vc_data *vc[MAX_NR_CONSOLES ];int i; +mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();for (i =1 ; i <MAX_NR_CONSOLES ; i++)if (!VT_BUSY (i))
@@ -316,6 +319,7 @@ static void vt_disallocate_all(void)else vc[i] =NULL ;console_unlock (); +mutex_unlock (&tty_mutex);for (i =1 ; i <MAX_NR_CONSOLES ; i++) {if (vc[i] && i >=MIN_NR_CONSOLES ) {
Signature · 1 line
2.25.1
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 55 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The
VT_DISALLOCATEioctl can free a virtual console whiletty_release()is still running, causing a use-after-free incon_shutdown(). This occurs becauseVT_DISALLOCATEonly considers a virtual console to be in-use if it has atty_structwith count > 0. But actually when count == 0, the tty is still in the process of being closed.Fix this by treating a virtual console as in-use if it has a
tty_structat all, even with zero count; and by makingVT_DISALLOCATEtake thetty_mutexin order to provide synchronization withrelease_tty().Reproducer:
#include <fcntl.h> #include <linux/vt.h> #include <sys/ioctl.h> #include <unistd.h> int main() { if (fork()) { for (;;) close(open("/dev/tty5", O_RDWR)); } else { int fd = open("/dev/tty10", O_RDWR); for (;;) ioctl(fd, VT_DISALLOCATE, 5); } }KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035
Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660
That means the associated tty_port is destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway.
Quoted 22 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Reported-by [email protected]Signed-off-by Eric Biggers <[email protected]>--- drivers/tty/vt/vt_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/tty/vt/vt_ioctl.c +1
-1@@ -42,7 +42,7 @@char vt_dont_switch;extern struct tty_driver *console_driver; -#define VT_IS_IN_USE (i) (console_driver->ttys[i] && console_driver->ttys[i]->count) +#define VT_IS_IN_USE (i) (console_driver->ttys[i] != NULL)#define VT_BUSY (i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)/*
drivers/tty/vt/vt_ioctl.c static int vt_disallocate(unsigned int vc_num) · line 292
Quoted 5 lines
drivers/tty/vt/vt_ioctl.c +1
-0@@ -288,12 +288,14 @@ static int vt_disallocate(unsigned int vc_num)struct vc_data *vc =NULL ;int ret =0 ; +mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();
Is this lock dependency new or pre-existing?
Locking tty_mutex here does not sound quite right. What about switching vc_data to proper refcounting based on tty_port? (Instead of doing tty_port_destroy and kfree in vt_disallocate*.)
drivers/tty/vt/vt_ioctl.c static int vt_disallocate(unsigned int vc_num) · line 301
Quoted 9 lines
drivers/tty/vt/vt_ioctl.c +1
-0if (VT_BUSY (vc_num)) ret = -EBUSY ;else if (vc_num) vc =vc_deallocate (vc_num);console_unlock (); +mutex_unlock (&tty_mutex);if (vc && vc_num >=MIN_NR_CONSOLES ) {tty_port_destroy (&vc->port);
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 61 lines · Jiri Slaby
Quoted 24 lines
KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660That means the associated
tty_portis destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway.Quoted 25 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Reported-by [email protected]Signed-off-by Eric Biggers <[email protected]>--- drivers/tty/vt/vt_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/tty/vt/vt_ioctl.c +1
-1@@ -42,7 +42,7 @@char vt_dont_switch;extern struct tty_driver *console_driver; -#define VT_IS_IN_USE (i) (console_driver->ttys[i] && console_driver->ttys[i]->count) +#define VT_IS_IN_USE (i) (console_driver->ttys[i] != NULL)#define VT_BUSY (i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)/* @@ -288,12 +288,14 @@ static int vt_disallocate(unsigned int vc_num)struct vc_data *vc =NULL ;int ret =0 ;
Quoted 4 lines
drivers/tty/vt/vt_ioctl.c static int vt_disallocate(unsigned int vc_num) · line 292
Quoted 2 lines
drivers/tty/vt/vt_ioctl.c +1
-0+mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();Is this lock dependency new or pre-existing?
It's the same locking order used during release_tty().
Quoted 5 lines
Locking
tty_mutexhere does not sound quite right. What about switchingvc_datato proper refcounting based ontty_port? (Instead of doingtty_port_destroyand kfree in vt_disallocate*.)
How would that work? We could make struct vc_data refcounted such that VT_DISALLOCATE doesn't free it right away but rather it's freed in the next con_shutdown(). But release_tty() still accesses tty->port afterwards, which is part of the 'struct vc_data' that would have just been freed.
- Eric
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 75 lines · Eric Biggers
Quoted 61 lines · Jiri Slaby
Quoted 24 lines
KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660That means the associated
tty_portis destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway.Quoted 25 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Reported-by [email protected]Signed-off-by Eric Biggers <[email protected]>--- drivers/tty/vt/vt_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/tty/vt/vt_ioctl.c +1
-1@@ -42,7 +42,7 @@char vt_dont_switch;extern struct tty_driver *console_driver; -#define VT_IS_IN_USE (i) (console_driver->ttys[i] && console_driver->ttys[i]->count) +#define VT_IS_IN_USE (i) (console_driver->ttys[i] != NULL)#define VT_BUSY (i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)/* @@ -288,12 +288,14 @@ static int vt_disallocate(unsigned int vc_num)struct vc_data *vc =NULL ;int ret =0 ;Quoted 4 lines
drivers/tty/vt/vt_ioctl.c static int vt_disallocate(unsigned int vc_num) · line 292
Quoted 2 lines
drivers/tty/vt/vt_ioctl.c +1
-0+mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();Is this lock dependency new or pre-existing?
It's the same locking order used during
release_tty().Quoted 5 lines
Locking
tty_mutexhere does not sound quite right. What about switchingvc_datato proper refcounting based ontty_port? (Instead of doingtty_port_destroyand kfree in vt_disallocate*.)
Quoted 5 lines
How would that work? We could make struct
vc_datarefcounted such thatVT_DISALLOCATEdoesn't free it right away but rather it's freed in the nextcon_shutdown(). Butrelease_tty()still accessestty->portafterwards, which is part of the 'structvc_data' that would have just been freed.
Jiri, can you explain what you meant here? I don't see how your suggestion would solve the problem.
Greg, any opinion?
- Eric
Greg Kroah-Hartman
maintainerRe: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 82 lines · Eric Biggers
Quoted 75 lines · Eric Biggers
Quoted 61 lines · Jiri Slaby
Quoted 24 lines
KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660That means the associated
tty_portis destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway.Quoted 25 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Reported-by [email protected]Signed-off-by Eric Biggers <[email protected]>--- drivers/tty/vt/vt_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/tty/vt/vt_ioctl.c +1
-1@@ -42,7 +42,7 @@char vt_dont_switch;extern struct tty_driver *console_driver; -#define VT_IS_IN_USE (i) (console_driver->ttys[i] && console_driver->ttys[i]->count) +#define VT_IS_IN_USE (i) (console_driver->ttys[i] != NULL)#define VT_BUSY (i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)/* @@ -288,12 +288,14 @@ static int vt_disallocate(unsigned int vc_num)struct vc_data *vc =NULL ;int ret =0 ;Quoted 4 lines
drivers/tty/vt/vt_ioctl.c static int vt_disallocate(unsigned int vc_num) · line 292
Quoted 2 lines
drivers/tty/vt/vt_ioctl.c +1
-0+mutex_lock (&tty_mutex);/* synchronize with release_tty() */ console_lock ();Is this lock dependency new or pre-existing?
It's the same locking order used during
release_tty().Quoted 5 lines
Locking
tty_mutexhere does not sound quite right. What about switchingvc_datato proper refcounting based ontty_port? (Instead of doingtty_port_destroyand kfree in vt_disallocate*.)Quoted 5 lines
How would that work? We could make struct
vc_datarefcounted such thatVT_DISALLOCATEdoesn't free it right away but rather it's freed in the nextcon_shutdown(). Butrelease_tty()still accessestty->portafterwards, which is part of the 'structvc_data' that would have just been freed.
Quoted 4 lines
Jiri, can you explain what you meant here? I don't see how your suggestion would solve the problem.
Greg, any opinion?
I'll defer to Jiri here :)
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 6 lines · Greg Kroah-Hartman
Quoted 4 lines
Jiri, can you explain what you meant here? I don't see how your suggestion would solve the problem.
Greg, any opinion?
I'll defer to Jiri here :)
Heh, thanks.
I started looking into this yesterday, but was interrupted by other tasks. Stay tuned.
regards,
Signature · 2 lines
js suse labs
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
In reply to Eric BiggersQuoted 36 lines · Eric Biggers
Quoted 35 lines · Jiri Slaby
Quoted 24 lines
KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660That means the associated
tty_portis destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway.
...
Quoted 9 lines
Quoted 4 lines
Locking
tty_mutexhere does not sound quite right. What about switchingvc_datato proper refcounting based ontty_port? (Instead of doingtty_port_destroyand kfree in vt_disallocate*.)How would that work? We could make struct
vc_datarefcounted such thatVT_DISALLOCATEdoesn't free it right away but rather it's freed in the nextcon_shutdown(). Butrelease_tty()still accessestty->portafterwards, which is part of the 'structvc_data' that would have just been freed.
Yes, but if it does the same as pty, i.e. throwing tty_port in ->cleanup, not ->shutdown, that would work, right?
The initial requirement from tty_port is that it outlives tty. This was later lifted by pty to live at least till ->cleanup.
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 50 lines · Jiri Slaby
Quoted 36 lines · Eric Biggers
Quoted 35 lines · Jiri Slaby
Quoted 24 lines
KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035Quoted 8 lines
[...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660That means the associated
tty_portis destroyed while the tty layer still has a tty on the top of it. That is a BUG anyway....
Quoted 9 lines
Quoted 4 lines
Locking
tty_mutexhere does not sound quite right. What about switchingvc_datato proper refcounting based ontty_port? (Instead of doingtty_port_destroyand kfree in vt_disallocate*.)How would that work? We could make struct
vc_datarefcounted such thatVT_DISALLOCATEdoesn't free it right away but rather it's freed in the nextcon_shutdown(). Butrelease_tty()still accessestty->portafterwards, which is part of the 'structvc_data' that would have just been freed.
Quoted 6 lines
Yes, but if it does the same as pty, i.e. throwing
tty_portin ->cleanup, not ->shutdown, that would work, right?The initial requirement from
tty_portis that it outlives tty. This was later lifted by pty to live at least till ->cleanup.
Yes, it looks like that will work. I didn't know about tty_operations::cleanup(). I'll update the patch.
- Eric
v2 cover vt: fix some vt_ioctl races
Fix VT_DISALLOCATE freeing an in-use virtual console, and fix a use-after-free in vt_in_use().
Changed since v1:
- Made the vc_data be freed via tty_port refcounting.
- Added patch to fix a use-after-free in vt_in_use().
Eric Biggers (2):
vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
vt: vt_ioctl: fix use-after-free in vt_in_use()
drivers/tty/vt/vt.c | 14 +++++++++++++- drivers/tty/vt/vt_ioctl.c | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 2/2 vt: vt_ioctl: fix use-after-free in vt_in_use()
From: Eric Biggers <[email protected]>
vt_in_use() dereferences console_driver->ttys[i] without proper locking. This is broken because the tty can be closed and freed concurrently.
We could fix this by using 'READ_ONCE(console_driver->ttys[i]) != NULL' and skipping the check of tty_struct::count. But, looking at console_driver->ttys[i] isn't really appropriate anyway because even if it is NULL the tty can still be in the process of being closed.
Instead, fix it by making vt_in_use() require console_lock() and check whether the vt is allocated and has port refcount > 1. This works since following the patch "vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console" the port refcount is incremented while the vt is open.
Reproducer (very unreliable, but it worked for me after a few minutes):
#include <fcntl.h>
#include <linux/vt.h>
int main()
{
int fd, nproc;
struct vt_stat state;
char ttyname[16];
fd = open("/dev/tty10", O_RDONLY);
for (nproc = 1; nproc < 8; nproc *= 2)
fork();
for (;;) {
sprintf(ttyname, "/dev/tty%d", rand() % 8);
close(open(ttyname, O_RDONLY));
ioctl(fd, VT_GETSTATE, &state);
}
}KASAN report:
BUG: KASAN: use-after-free in vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] BUG: KASAN: use-after-free in vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 Read of size 4 at addr ffff888065722468 by task syz-vt2/132 CPU: 0 PID: 132 Comm: syz-vt2 Not tainted 5.6.0-rc5-00130-g089b6d3654916 #13 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...] Allocated by task 136: [...] kzalloc include/linux/slab.h:669 [inline] alloc_tty_struct+0x96/0x8a0 drivers/tty/tty_io.c:2982 tty_init_dev+0x23/0x350 drivers/tty/tty_io.c:1334 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 41: [...] kfree+0xbf/0x200 mm/slab.c:3757 free_tty_struct+0x8d/0xb0 drivers/tty/tty_io.c:177 release_one_tty+0x22d/0x2f0 drivers/tty/tty_io.c:1468 process_one_work+0x7f1/0x14b0 kernel/workqueue.c:2264 worker_thread+0x8b/0xc80 kernel/workqueue.c:2410 [...]
--- drivers/tty/vt/vt_ioctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/tty/vt/vt_ioctl.c +8 -4
@@ -43,9 +43,11 @@ bool vt_dont_switch;static inline bool vt_in_use (unsigned int i) { -extern struct tty_driver *console_driver; +const struct vc_data *vc = vc_cons[i].d; -return console_driver->ttys[i] && console_driver->ttys[i]->count; +WARN_CONSOLE_UNLOCKED (); + +return vc &&kref_read (&vc->port.kref) >1 ; }static inline bool vt_busy (int i)
@@ -643,15 +645,16 @@ int vt_ioctl(struct tty_struct *tty,struct vt_stat __user *vtstat = up;unsigned short state, mask; -/* Review: FIXME: Console lock ? */ if (put_user (fg_console +1 , &vtstat->v_active)) ret = -EFAULT ;else { state =1 ;/* /dev/tty0 is always open */ +console_lock ();for (i =0 , mask =2 ; i <MAX_NR_CONSOLES && mask; ++i, mask <<=1 )if (vt_in_use (i)) state |= mask; +console_unlock (); ret =put_user (state, &vtstat->v_state); }break ;
@@ -661,10 +664,11 @@ int vt_ioctl(struct tty_struct *tty,* Returns the first available (non-opened) console. */ case VT_OPENQRY : -/* FIXME: locking ? - but then this is a stupid API */ +console_lock ();for (i =0 ; i <MAX_NR_CONSOLES ; ++i)if (!vt_in_use (i))break ; +console_unlock (); uival = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; goto setint;
Signature · 1 line
2.25.1
PATCH v2 1/2 vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
The VT_DISALLOCATE ioctl can free a virtual console while tty_release() is still running, causing a use-after-free in con_shutdown(). This occurs because VT_DISALLOCATE considers a virtual console's 'struct vc_data' to be unused as soon as the corresponding tty's refcount hits 0. But actually it may be still being closed.
Fix this by making vc_data be reference-counted via the embedded 'struct tty_port'. A newly allocated virtual console has refcount 1. Opening it for the first time increments the refcount to 2. Closing it for the last time decrements the refcount (in tty_operations::cleanup() so that it happens late enough), as does VT_DISALLOCATE.
Reproducer:
#include <fcntl.h>
#include <linux/vt.h>
#include <sys/ioctl.h>
#include <unistd.h>
int main()
{
if (fork()) {
for (;;)
close(open("/dev/tty5", O_RDWR));
} else {
int fd = open("/dev/tty10", O_RDWR);
for (;;)
ioctl(fd, VT_DISALLOCATE, 5);
}
}KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...]
--- drivers/tty/vt/vt.c | 14 +++++++++++++- drivers/tty/vt/vt_ioctl.c | 12 ++++-------- 2 files changed, 17 insertions(+), 9 deletions(-)
drivers/tty/vt/vt.c +13 -1
@@ -1102,6 +1102,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */tty_port_init (&vc->port);INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK); +/* if this wasn't the case, we'd have to implement port->ops.destruct */ +BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); +visual_init (vc, currcons,1 );if (!*vc->vc_uni_pagedir_loc)
@@ -3250,6 +3253,7 @@ static int con_install(struct tty_driver *driver, struct tty_struct *tty) tty->driver_data = vc; vc->port.tty = tty; +tty_port_get (&vc->port);if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
@@ -3285,6 +3289,13 @@ static void con_shutdown(struct tty_struct *tty)console_unlock (); } +static void con_cleanup (struct tty_struct *tty) +{ +struct vc_data *vc = tty->driver_data; + +tty_port_put (&vc->port); +} +static int default_color =7 ;/* white */ static int default_italic_color =2 ;// green (ASCII) static int default_underline_color =3 ;// cyan (ASCII)
@@ -3410,7 +3421,8 @@ static const struct tty_operations con_ops = { .throttle = con_throttle, .unthrottle = con_unthrottle, .resize = vt_resize, - .shutdown = con_shutdown + .shutdown = con_shutdown, + .cleanup = con_cleanup, };static struct cdev vc0_cdev;
drivers/tty/vt/vt_ioctl.c +4 -8
@@ -310,10 +310,8 @@ static int vt_disallocate(unsigned int vc_num) vc =vc_deallocate (vc_num);console_unlock (); -if (vc && vc_num >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc->port); -kfree (vc); - } +if (vc && vc_num >=MIN_NR_CONSOLES ) +tty_port_put (&vc->port);return ret; }
@@ -333,10 +331,8 @@ static void vt_disallocate_all(void)console_unlock ();for (i =1 ; i <MAX_NR_CONSOLES ; i++) { -if (vc[i] && i >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc[i]->port); -kfree (vc[i]); - } +if (vc[i] && i >=MIN_NR_CONSOLES ) +tty_port_put (&vc[i]->port); } }
Signature · 1 line
2.25.1
Re: [PATCH v2 1/2] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
drivers/tty/vt/vt.c int vc_allocate(unsigned int currcons) /* return 0 on success */ · line 1107
Quoted 9 lines · Eric Biggers
drivers/tty/vt/vt.c +3
-0@@ -1102,6 +1102,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */tty_port_init (&vc->port);INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK); +/* if this wasn't the case, we'd have to implement port->ops.destruct */ +BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); +
This is 3 lines, implementing destruct would be like 4-5 :)? Please implement destruct instead.
Otherwise looks good.
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH v2 1/2] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 7 lines · Jiri Slaby
Quoted 6 lines · Eric Biggers
drivers/tty/vt/vt.c +0
-0@@ -1102,6 +1102,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */tty_port_init (&vc->port);INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);
Quoted 9 lines
drivers/tty/vt/vt.c int vc_allocate(unsigned int currcons) /* return 0 on success */ · line 1107
Quoted 3 lines
drivers/tty/vt/vt.c +3
-0+/* if this wasn't the case, we'd have to implement port->ops.destruct */ +BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); +This is 3 lines, implementing destruct would be like 4-5 :)? Please implement destruct instead.
Otherwise looks good.
Actually implementing destruct would be 12 lines, see below. Remember there is no tty_port_operations defined yet so we'd have to define it just for destruct.
Do you still prefer it?
drivers/tty/vt/vt.c +12 -3
@@ -1075,6 +1075,17 @@ static void visual_deinit(struct vc_data *vc)module_put (vc->vc_sw->owner); } +static void vc_port_destruct (struct tty_port *port) +{ + struct vc_data *vc = container_of(port, struct vc_data, port); + +kfree (vc); +} + +static const struct tty_port_operations vc_port_ops = { + .destruct = vc_port_destruct, +}; +int vc_allocate (unsigned int currcons)/* return 0 on success */ {struct vt_notifier_param param;
@@ -1100,11 +1111,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ vc_cons[currcons].d = vc;tty_port_init (&vc->port); + vc->port.ops = &vc_port_ops;INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK); -/* if this wasn't the case, we'd have to implement port->ops.destruct */ -BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); -visual_init (vc, currcons,1 );if (!*vc->vc_uni_pagedir_loc)
Greg Kroah-Hartman
maintainerRe: [PATCH v2 1/2] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
Quoted 48 lines · Eric Biggers
Quoted 7 lines · Jiri Slaby
Quoted 6 lines · Eric Biggers
drivers/tty/vt/vt.c +0
-0@@ -1102,6 +1102,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */tty_port_init (&vc->port);INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);Quoted 9 lines
drivers/tty/vt/vt.c int vc_allocate(unsigned int currcons) /* return 0 on success */ · line 1107
Quoted 3 lines
drivers/tty/vt/vt.c +3
-0+/* if this wasn't the case, we'd have to implement port->ops.destruct */ +BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); +This is 3 lines, implementing destruct would be like 4-5 :)? Please implement destruct instead.
Otherwise looks good.
Actually implementing destruct would be 12 lines, see below. Remember there is no
tty_port_operationsdefined yet so we'd have to define it just for destruct.Do you still prefer it?
drivers/tty/vt/vt.c +11
-0@@ -1075,6 +1075,17 @@ static void visual_deinit(struct vc_data *vc)module_put (vc->vc_sw->owner); } +static void vc_port_destruct (struct tty_port *port) +{ + struct vc_data *vc = container_of(port, struct vc_data, port); + +kfree (vc); +} + +static const struct tty_port_operations vc_port_ops = { + .destruct = vc_port_destruct, +}; +int vc_allocate (unsigned int currcons)/* return 0 on success */ {struct vt_notifier_param param;@@ -1100,11 +1111,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ vc_cons[currcons].d = vc;
drivers/tty/vt/vt.c int vc_allocate(unsigned int currcons) /* return 0 on success */ · line 1119
Quoted 10 lines
drivers/tty/vt/vt.c +1
-3tty_port_init (&vc->port); + vc->port.ops = &vc_port_ops;INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK); -/* if this wasn't the case, we'd have to implement port->ops.destruct */ -BUILD_BUG_ON (offsetof(struct vc_data , port) !=0 ); -visual_init (vc, currcons,1 );if (!*vc->vc_uni_pagedir_loc)
Yes, this is good to have, thanks for doing this.
greg k-h
Re: [PATCH v2 2/2] vt: vt_ioctl: fix use-after-free in vt_in_use()
In reply to Eric BiggersQuoted 17 lines · Eric Biggers
drivers/tty/vt/vt_ioctl.c +4
-2@@ -43,9 +43,11 @@ bool vt_dont_switch;static inline bool vt_in_use (unsigned int i) { -extern struct tty_driver *console_driver; +const struct vc_data *vc = vc_cons[i].d; -return console_driver->ttys[i] && console_driver->ttys[i]->count; +WARN_CONSOLE_UNLOCKED (); + +return vc &&kref_read (&vc->port.kref) >1 ; }static inline bool vt_busy (int i)
drivers/tty/vt/vt_ioctl.c int vt_ioctl(struct tty_struct *tty, · line 652
Quoted 9 lines
drivers/tty/vt/vt_ioctl.c +1
-1@@ -643,15 +645,16 @@ int vt_ioctl(struct tty_struct *tty,struct vt_stat __user *vtstat = up;unsigned short state, mask; -/* Review: FIXME: Console lock ? */ if (put_user (fg_console +1 , &vtstat->v_active)) ret = -EFAULT ;else { state =1 ;/* /dev/tty0 is always open */ +console_lock ();
Could you comment on this one and the lock below why you added it here?
To me, it seems, we should rather introduce a vt alloc/dealloc lock protecting cases like this, not console lock. But not now, some time later. So a comment would help when/once we/I get into it...
The interface (ie. the ioctls) also look weird and racy. Both of them. Like the "OK, I give you this number, but it might not be correct by now." kind of thing.
This let me think, who could use this? The answer is many 8-/. openpt, systemd, sysvinit, didn't check others.
Perhaps we should provide openvt -- analogy of openpty and deprecate VT_OPENQRY?
With VT_GETSTATE, the situation is more complicated:
sysvinit uses VT_GETSTATE only if TIOCGDEV is not available, so VT_GETSTATE is actually unneeded there.
systemd uses it to find the current console (vtstat->v_active) and systemd-logind uses it for spawning autovt on free consoles. That sort of makes sense...
Quoted 12 lines
drivers/tty/vt/vt_ioctl.c +1
-0for (i =0 , mask =2 ; i <MAX_NR_CONSOLES && mask; ++i, mask <<=1 )if (vt_in_use (i)) state |= mask; +console_unlock (); ret =put_user (state, &vtstat->v_state); }break ;@@ -661,10 +664,11 @@ int vt_ioctl(struct tty_struct *tty,* Returns the first available (non-opened) console. */
drivers/tty/vt/vt_ioctl.c int vt_ioctl(struct tty_struct *tty, · line 674
Quoted 10 lines
drivers/tty/vt/vt_ioctl.c +2
-1case VT_OPENQRY : -/* FIXME: locking ? - but then this is a stupid API */ +console_lock ();for (i =0 ; i <MAX_NR_CONSOLES ; ++i)if (!vt_in_use (i))break ; +console_unlock (); uival = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; goto setint;
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH v2 2/2] vt: vt_ioctl: fix use-after-free in vt_in_use()
Quoted 30 lines · Jiri Slaby
Quoted 17 lines · Eric Biggers
drivers/tty/vt/vt_ioctl.c +4
-2@@ -43,9 +43,11 @@ bool vt_dont_switch;static inline bool vt_in_use (unsigned int i) { -extern struct tty_driver *console_driver; +const struct vc_data *vc = vc_cons[i].d; -return console_driver->ttys[i] && console_driver->ttys[i]->count; +WARN_CONSOLE_UNLOCKED (); + +return vc &&kref_read (&vc->port.kref) >1 ; }static inline bool vt_busy (int i)drivers/tty/vt/vt_ioctl.c int vt_ioctl(struct tty_struct *tty, · line 652
Quoted 9 lines
drivers/tty/vt/vt_ioctl.c +1
-1@@ -643,15 +645,16 @@ int vt_ioctl(struct tty_struct *tty,struct vt_stat __user *vtstat = up;unsigned short state, mask; -/* Review: FIXME: Console lock ? */ if (put_user (fg_console +1 , &vtstat->v_active)) ret = -EFAULT ;else { state =1 ;/* /dev/tty0 is always open */ +console_lock ();Could you comment on this one and the lock below why you added it here?
Quoted 3 lines
To me, it seems, we should rather introduce a vt alloc/dealloc lock protecting cases like this, not console lock. But not now, some time later. So a comment would help when/once we/I get into it...
I think the locking I added to VT_GETSTATE and VT_OPENQRY is pretty
self-explanatory: it's needed because they call vt_in_use() which now requires console_lock. So I'm not sure what you'd like me to add there?
As for vt_in_use() itself, I already added WARN_CONSOLE_UNLOCKED() to it. But I can add a comment to it too if it would be useful, like:
static inline bool vt_in_use(unsigned int i)
{
const struct vc_data *vc = vc_cons[i].d;
/*
* console_lock must be held to prevent the vc from being deallocated
* while we're checking whether it's in-use.
*/
WARN_CONSOLE_UNLOCKED();
return vc && kref_read(&vc->port.kref) > 1;
}Quoted 10 lines
The interface (ie. the ioctls) also look weird and racy. Both of them. Like the "OK, I give you this number, but it might not be correct by now." kind of thing.
This let me think, who could use this? The answer is many 8-/. openpt, systemd, sysvinit, didn't check others.
Perhaps we should provide openvt -- analogy of openpty and deprecate
VT_OPENQRY?
Quoted 8 lines
With
VT_GETSTATE, the situation is more complicated:
sysvinit usesVT_GETSTATEonly if TIOCGDEV is not available, soVT_GETSTATEis actually unneeded there.systemd uses it to find the current console (
vtstat->v_active) and systemd-logind uses it for spawning autovt on free consoles. That sort of makes sense...
Yes, these are bad APIs.
Once I did remove a buggy ioctl elsewhere in the kernel rather than fixing it. But you have to be very, very confident that nothing is using it. That doesn't seem to be the case for VT_GETSTATE and VT_OPENQRY as it's not hard to find code using them. E.g. here's another user of both of them:
https://android.googlesource.com/platform/system/core/+/ccecf1425412beb2bc3bb38d470293fdc244d6f1/toolbox/setconsole.c
So we're probably stuck with them for now. If you'd like to explore adding a better API and trying to get all users to use it, you're certainly welcome to. But it would be orthogonal to fixing this bug.
- Eric
v3 cover vt: fix some vt_ioctl races
Fix VT_DISALLOCATE freeing an in-use virtual console, and fix a use-after-free in vt_in_use().
Changed since v2:
- Implemented tty_port_operations::destruct().
- Added comments regarding vt_in_use() locking.
Changed since v1:
- Made the vc_data be freed via tty_port refcounting.
- Added patch to fix a use-after-free in vt_in_use().
Eric Biggers (2):
vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
vt: vt_ioctl: fix use-after-free in vt_in_use()
drivers/tty/vt/vt.c | 23 ++++++++++++++++++++++- drivers/tty/vt/vt_ioctl.c | 28 ++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.2
PATCH v3 1/2 vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
From: Eric Biggers <[email protected]>
The VT_DISALLOCATE ioctl can free a virtual console while tty_release() is still running, causing a use-after-free in con_shutdown(). This occurs because VT_DISALLOCATE considers a virtual console's 'struct vc_data' to be unused as soon as the corresponding tty's refcount hits 0. But actually it may be still being closed.
Fix this by making vc_data be reference-counted via the embedded 'struct tty_port'. A newly allocated virtual console has refcount 1. Opening it for the first time increments the refcount to 2. Closing it for the last time decrements the refcount (in tty_operations::cleanup() so that it happens late enough), as does VT_DISALLOCATE.
Reproducer:
#include <fcntl.h>
#include <linux/vt.h>
#include <sys/ioctl.h>
#include <unistd.h>
int main()
{
if (fork()) {
for (;;)
close(open("/dev/tty5", O_RDWR));
} else {
int fd = open("/dev/tty10", O_RDWR);
for (;;)
ioctl(fd, VT_DISALLOCATE, 5);
}
}KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...]
--- drivers/tty/vt/vt.c | 23 ++++++++++++++++++++++- drivers/tty/vt/vt_ioctl.c | 12 ++++-------- 2 files changed, 26 insertions(+), 9 deletions(-)
drivers/tty/vt/vt.c +22 -1
@@ -1075,6 +1075,17 @@ static void visual_deinit(struct vc_data *vc)module_put (vc->vc_sw->owner); } +static void vc_port_destruct (struct tty_port *port) +{ + struct vc_data *vc = container_of(port, struct vc_data, port); + +kfree (vc); +} + +static const struct tty_port_operations vc_port_ops = { + .destruct = vc_port_destruct, +}; +int vc_allocate (unsigned int currcons)/* return 0 on success */ {struct vt_notifier_param param;
@@ -1100,6 +1111,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ vc_cons[currcons].d = vc;tty_port_init (&vc->port); + vc->port.ops = &vc_port_ops;INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);visual_init (vc, currcons,1 );
@@ -3250,6 +3262,7 @@ static int con_install(struct tty_driver *driver, struct tty_struct *tty) tty->driver_data = vc; vc->port.tty = tty; +tty_port_get (&vc->port);if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
@@ -3285,6 +3298,13 @@ static void con_shutdown(struct tty_struct *tty)console_unlock (); } +static void con_cleanup (struct tty_struct *tty) +{ +struct vc_data *vc = tty->driver_data; + +tty_port_put (&vc->port); +} +static int default_color =7 ;/* white */ static int default_italic_color =2 ;// green (ASCII) static int default_underline_color =3 ;// cyan (ASCII)
@@ -3410,7 +3430,8 @@ static const struct tty_operations con_ops = { .throttle = con_throttle, .unthrottle = con_unthrottle, .resize = vt_resize, - .shutdown = con_shutdown + .shutdown = con_shutdown, + .cleanup = con_cleanup, };static struct cdev vc0_cdev;
drivers/tty/vt/vt_ioctl.c +4 -8
@@ -310,10 +310,8 @@ static int vt_disallocate(unsigned int vc_num) vc =vc_deallocate (vc_num);console_unlock (); -if (vc && vc_num >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc->port); -kfree (vc); - } +if (vc && vc_num >=MIN_NR_CONSOLES ) +tty_port_put (&vc->port);return ret; }
@@ -333,10 +331,8 @@ static void vt_disallocate_all(void)console_unlock ();for (i =1 ; i <MAX_NR_CONSOLES ; i++) { -if (vc[i] && i >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc[i]->port); -kfree (vc[i]); - } +if (vc[i] && i >=MIN_NR_CONSOLES ) +tty_port_put (&vc[i]->port); } }
Signature · 1 line
2.25.2
PATCH v3 2/2 vt: vt_ioctl: fix use-after-free in vt_in_use()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
vt_in_use() dereferences console_driver->ttys[i] without proper locking. This is broken because the tty can be closed and freed concurrently.
We could fix this by using 'READ_ONCE(console_driver->ttys[i]) != NULL' and skipping the check of tty_struct::count. But, looking at console_driver->ttys[i] isn't really appropriate anyway because even if it is NULL the tty can still be in the process of being closed.
Instead, fix it by making vt_in_use() require console_lock() and check whether the vt is allocated and has port refcount > 1. This works since following the patch "vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console" the port refcount is incremented while the vt is open.
Reproducer (very unreliable, but it worked for me after a few minutes):
#include <fcntl.h>
#include <linux/vt.h>
int main()
{
int fd, nproc;
struct vt_stat state;
char ttyname[16];
fd = open("/dev/tty10", O_RDONLY);
for (nproc = 1; nproc < 8; nproc *= 2)
fork();
for (;;) {
sprintf(ttyname, "/dev/tty%d", rand() % 8);
close(open(ttyname, O_RDONLY));
ioctl(fd, VT_GETSTATE, &state);
}
}KASAN report:
BUG: KASAN: use-after-free in vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] BUG: KASAN: use-after-free in vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 Read of size 4 at addr ffff888065722468 by task syz-vt2/132 CPU: 0 PID: 132 Comm: syz-vt2 Not tainted 5.6.0-rc5-00130-g089b6d3654916 #13 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...] Allocated by task 136: [...] kzalloc include/linux/slab.h:669 [inline] alloc_tty_struct+0x96/0x8a0 drivers/tty/tty_io.c:2982 tty_init_dev+0x23/0x350 drivers/tty/tty_io.c:1334 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 41: [...] kfree+0xbf/0x200 mm/slab.c:3757 free_tty_struct+0x8d/0xb0 drivers/tty/tty_io.c:177 release_one_tty+0x22d/0x2f0 drivers/tty/tty_io.c:1468 process_one_work+0x7f1/0x14b0 kernel/workqueue.c:2264 worker_thread+0x8b/0xc80 kernel/workqueue.c:2410 [...]
--- drivers/tty/vt/vt_ioctl.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/tty/vt/vt_ioctl.c +12 -4
@@ -43,9 +43,15 @@ bool vt_dont_switch;static inline bool vt_in_use (unsigned int i) { -extern struct tty_driver *console_driver; +const struct vc_data *vc = vc_cons[i].d; -return console_driver->ttys[i] && console_driver->ttys[i]->count; +/* +* console_lock must be held to prevent the vc from being deallocated +* while we're checking whether it's in-use. +*/ +WARN_CONSOLE_UNLOCKED (); + +return vc &&kref_read (&vc->port.kref) >1 ; }static inline bool vt_busy (int i)
@@ -643,15 +649,16 @@ int vt_ioctl(struct tty_struct *tty,struct vt_stat __user *vtstat = up;unsigned short state, mask; -/* Review: FIXME: Console lock ? */ if (put_user (fg_console +1 , &vtstat->v_active)) ret = -EFAULT ;else { state =1 ;/* /dev/tty0 is always open */ +console_lock ();/* required by vt_in_use() */ for (i =0 , mask =2 ; i <MAX_NR_CONSOLES && mask; ++i, mask <<=1 )if (vt_in_use (i)) state |= mask; +console_unlock (); ret =put_user (state, &vtstat->v_state); }break ;
@@ -661,10 +668,11 @@ int vt_ioctl(struct tty_struct *tty,* Returns the first available (non-opened) console. */ case VT_OPENQRY : -/* FIXME: locking ? - but then this is a stupid API */ +console_lock ();/* required by vt_in_use() */ for (i =0 ; i <MAX_NR_CONSOLES ; ++i)if (!vt_in_use (i))break ; +console_unlock (); uival = i <MAX_NR_CONSOLES ? (i+1 ) :-1 ; goto setint;
Signature · 1 line
2.25.2
Greg Kroah-Hartman
maintainerRe: [PATCH v3 0/2] vt: fix some vt_ioctl races
In reply to Eric BiggersQuoted 11 lines · Eric Biggers
Fix
VT_DISALLOCATEfreeing an in-use virtual console, and fix a use-after-free invt_in_use().Changed since v2:
- Implementedtty_port_operations::destruct().
- Added comments regardingvt_in_use()locking.Changed since v1:
- Made thevc_databe freed viatty_portrefcounting.
- Added patch to fix a use-after-free invt_in_use().
Quoted 7 lines
Eric Biggers (2):
vt:vt_ioctl: fixVT_DISALLOCATEfreeing in-use virtual console
vt:vt_ioctl: fix use-after-free invt_in_use()drivers/tty/vt/vt.c | 23 ++++++++++++++++++++++- drivers/tty/vt/vt_ioctl.c | 28 ++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-)
Jiri, any objection to these?
thanks,
greg k-h
Re: [PATCH v3 1/2] vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
In reply to Eric BiggersQuoted 67 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The
VT_DISALLOCATEioctl can free a virtual console whiletty_release()is still running, causing a use-after-free incon_shutdown(). This occurs becauseVT_DISALLOCATEconsiders a virtual console's 'structvc_data' to be unused as soon as the corresponding tty's refcount hits 0. But actually it may be still being closed.Fix this by making
vc_databe reference-counted via the embedded 'structtty_port'. A newly allocated virtual console has refcount 1. Opening it for the first time increments the refcount to 2. Closing it for the last time decrements the refcount (intty_operations::cleanup()so that it happens late enough), as doesVT_DISALLOCATE.Reproducer:
#include <fcntl.h> #include <linux/vt.h> #include <sys/ioctl.h> #include <unistd.h> int main() { if (fork()) { for (;;) close(open("/dev/tty5", O_RDWR)); } else { int fd = open("/dev/tty10", O_RDWR); for (;;) ioctl(fd, VT_DISALLOCATE, 5); } }KASAN report:
BUG: KASAN: use-after-free in con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 Write of size 8 at addr ffff88806a4ec108 by task syz_vt/129 CPU: 0 PID: 129 Comm: syz_vt Not tainted 5.6.0-rc2 #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] con_shutdown+0x76/0x80 drivers/tty/vt/vt.c:3278 release_tty+0xa8/0x410 drivers/tty/tty_io.c:1514 tty_release_struct+0x34/0x50 drivers/tty/tty_io.c:1629 tty_release+0x984/0xed0 drivers/tty/tty_io.c:1789 [...] Allocated by task 129: [...] kzalloc include/linux/slab.h:669 [inline] vc_allocate drivers/tty/vt/vt.c:1085 [inline] vc_allocate+0x1ac/0x680 drivers/tty/vt/vt.c:1066 con_install+0x4d/0x3f0 drivers/tty/vt/vt.c:3229 tty_driver_install_tty drivers/tty/tty_io.c:1228 [inline] tty_init_dev+0x94/0x350 drivers/tty/tty_io.c:1341 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 130: [...] kfree+0xbf/0x1e0 mm/slab.c:3757 vt_disallocate drivers/tty/vt/vt_ioctl.c:300 [inline] vt_ioctl+0x16dc/0x1e30 drivers/tty/vt/vt_ioctl.c:818 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...]
Quoted 4 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Reported-by [email protected]Signed-off-by Eric Biggers <[email protected]>
Quoted 98 lines
--- drivers/tty/vt/vt.c | 23 ++++++++++++++++++++++- drivers/tty/vt/vt_ioctl.c | 12 ++++-------- 2 files changed, 26 insertions(+), 9 deletions(-)drivers/tty/vt/vt.c +22
-1@@ -1075,6 +1075,17 @@ static void visual_deinit(struct vc_data *vc)module_put (vc->vc_sw->owner); } +static void vc_port_destruct (struct tty_port *port) +{ + struct vc_data *vc = container_of(port, struct vc_data, port); + +kfree (vc); +} + +static const struct tty_port_operations vc_port_ops = { + .destruct = vc_port_destruct, +}; +int vc_allocate (unsigned int currcons)/* return 0 on success */ {struct vt_notifier_param param;@@ -1100,6 +1111,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ vc_cons[currcons].d = vc;tty_port_init (&vc->port); + vc->port.ops = &vc_port_ops;INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);visual_init (vc, currcons,1 );@@ -3250,6 +3262,7 @@ static int con_install(struct tty_driver *driver, struct tty_struct *tty) tty->driver_data = vc; vc->port.tty = tty; +tty_port_get (&vc->port);if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;@@ -3285,6 +3298,13 @@ static void con_shutdown(struct tty_struct *tty)console_unlock (); } +static void con_cleanup (struct tty_struct *tty) +{ +struct vc_data *vc = tty->driver_data; + +tty_port_put (&vc->port); +} +static int default_color =7 ;/* white */ static int default_italic_color =2 ;// green (ASCII) static int default_underline_color =3 ;// cyan (ASCII) @@ -3410,7 +3430,8 @@ static const struct tty_operations con_ops = { .throttle = con_throttle, .unthrottle = con_unthrottle, .resize = vt_resize, - .shutdown = con_shutdown + .shutdown = con_shutdown, + .cleanup = con_cleanup, };static struct cdev vc0_cdev;drivers/tty/vt/vt_ioctl.c +4
-8@@ -310,10 +310,8 @@ static int vt_disallocate(unsigned int vc_num) vc =vc_deallocate (vc_num);console_unlock (); -if (vc && vc_num >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc->port); -kfree (vc); - } +if (vc && vc_num >=MIN_NR_CONSOLES ) +tty_port_put (&vc->port);return ret; }@@ -333,10 +331,8 @@ static void vt_disallocate_all(void)console_unlock ();for (i =1 ; i <MAX_NR_CONSOLES ; i++) { -if (vc[i] && i >=MIN_NR_CONSOLES ) { -tty_port_destroy (&vc[i]->port); -kfree (vc[i]); - } +if (vc[i] && i >=MIN_NR_CONSOLES ) +tty_port_put (&vc[i]->port); } }
Signature · 2 lines
js suse labs
Re: [PATCH v3 2/2] vt: vt_ioctl: fix use-after-free in vt_in_use()
In reply to Eric BiggersQuoted 69 lines · Eric Biggers
From: Eric Biggers <[email protected]>
vt_in_use()dereferences console_driver->ttys[i] without proper locking. This is broken because the tty can be closed and freed concurrently.We could fix this by using '
READ_ONCE(console_driver->ttys[i])!= NULL' and skipping the check oftty_struct::count. But, looking at console_driver->ttys[i] isn't really appropriate anyway because even if it is NULL the tty can still be in the process of being closed.Instead, fix it by making
vt_in_use()requireconsole_lock()and check whether the vt is allocated and has port refcount > 1. This works since following the patch "vt:vt_ioctl: fixVT_DISALLOCATEfreeing in-use virtual console" the port refcount is incremented while the vt is open.Reproducer (very unreliable, but it worked for me after a few minutes):
#include <fcntl.h> #include <linux/vt.h> int main() { int fd, nproc; struct vt_stat state; char ttyname[16]; fd = open("/dev/tty10", O_RDONLY); for (nproc = 1; nproc < 8; nproc *= 2) fork(); for (;;) { sprintf(ttyname, "/dev/tty%d", rand() % 8); close(open(ttyname, O_RDONLY)); ioctl(fd, VT_GETSTATE, &state); } }KASAN report:
BUG: KASAN: use-after-free in vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] BUG: KASAN: use-after-free in vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 Read of size 4 at addr ffff888065722468 by task syz-vt2/132 CPU: 0 PID: 132 Comm: syz-vt2 Not tainted 5.6.0-rc5-00130-g089b6d3654916 #13 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191223_100556-anatol 04/01/2014 Call Trace: [...] vt_in_use drivers/tty/vt/vt_ioctl.c:48 [inline] vt_ioctl+0x1ad3/0x1d70 drivers/tty/vt/vt_ioctl.c:657 tty_ioctl+0x9db/0x11b0 drivers/tty/tty_io.c:2660 [...] Allocated by task 136: [...] kzalloc include/linux/slab.h:669 [inline] alloc_tty_struct+0x96/0x8a0 drivers/tty/tty_io.c:2982 tty_init_dev+0x23/0x350 drivers/tty/tty_io.c:1334 tty_open_by_driver drivers/tty/tty_io.c:1987 [inline] tty_open+0x3ca/0xb30 drivers/tty/tty_io.c:2035 [...] Freed by task 41: [...] kfree+0xbf/0x200 mm/slab.c:3757 free_tty_struct+0x8d/0xb0 drivers/tty/tty_io.c:177 release_one_tty+0x22d/0x2f0 drivers/tty/tty_io.c:1468 process_one_work+0x7f1/0x14b0 kernel/workqueue.c:2264 worker_thread+0x8b/0xc80 kernel/workqueue.c:2410 [...]
Quoted 3 lines
Fixes 4001d7b7fc27 ("vt: push down the tty lock so we can see what is left to tackle")Cc <[email protected]> # v3.4+Signed-off-by Eric Biggers <[email protected]>
I cannot think of anything better with the current poor code state, so:
thanks,
Signature · 3 lines
-- js suse labs