From: Greg Kroah-Hartman Date: Mon, 9 Mar 2020 19:35:37 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.216~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=381f5dc1cf6fce2379181afa2a733af69d0b7c73;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: vt-selection-push-sel_lock-up.patch x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index 8f90f3b4f1c..f72164142b3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -102,3 +102,5 @@ tty-serial-mvebu-uart-fix-a-wrong-return.patch serial-8250_exar-add-support-for-acces-cards.patch vt-selection-close-sel_buffer-race.patch vt-selection-push-console-lock-down.patch +vt-selection-push-sel_lock-up.patch +x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch diff --git a/queue-4.14/vt-selection-push-sel_lock-up.patch b/queue-4.14/vt-selection-push-sel_lock-up.patch new file mode 100644 index 00000000000..222df031120 --- /dev/null +++ b/queue-4.14/vt-selection-push-sel_lock-up.patch @@ -0,0 +1,145 @@ +From e8c75a30a23c6ba63f4ef6895cbf41fd42f21aa2 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Fri, 28 Feb 2020 12:54:06 +0100 +Subject: vt: selection, push sel_lock up + +From: Jiri Slaby + +commit e8c75a30a23c6ba63f4ef6895cbf41fd42f21aa2 upstream. + +sel_lock cannot nest in the console lock. Thanks to syzkaller, the +kernel states firmly: + +> WARNING: possible circular locking dependency detected +> 5.6.0-rc3-syzkaller #0 Not tainted +> ------------------------------------------------------ +> syz-executor.4/20336 is trying to acquire lock: +> ffff8880a2e952a0 (&tty->termios_rwsem){++++}, at: tty_unthrottle+0x22/0x100 drivers/tty/tty_ioctl.c:136 +> +> but task is already holding lock: +> ffffffff89462e70 (sel_lock){+.+.}, at: paste_selection+0x118/0x470 drivers/tty/vt/selection.c:374 +> +> which lock already depends on the new lock. +> +> the existing dependency chain (in reverse order) is: +> +> -> #2 (sel_lock){+.+.}: +> mutex_lock_nested+0x1b/0x30 kernel/locking/mutex.c:1118 +> set_selection_kernel+0x3b8/0x18a0 drivers/tty/vt/selection.c:217 +> set_selection_user+0x63/0x80 drivers/tty/vt/selection.c:181 +> tioclinux+0x103/0x530 drivers/tty/vt/vt.c:3050 +> vt_ioctl+0x3f1/0x3a30 drivers/tty/vt/vt_ioctl.c:364 + +This is ioctl(TIOCL_SETSEL). +Locks held on the path: console_lock -> sel_lock + +> -> #1 (console_lock){+.+.}: +> console_lock+0x46/0x70 kernel/printk/printk.c:2289 +> con_flush_chars+0x50/0x650 drivers/tty/vt/vt.c:3223 +> n_tty_write+0xeae/0x1200 drivers/tty/n_tty.c:2350 +> do_tty_write drivers/tty/tty_io.c:962 [inline] +> tty_write+0x5a1/0x950 drivers/tty/tty_io.c:1046 + +This is write(). +Locks held on the path: termios_rwsem -> console_lock + +> -> #0 (&tty->termios_rwsem){++++}: +> down_write+0x57/0x140 kernel/locking/rwsem.c:1534 +> tty_unthrottle+0x22/0x100 drivers/tty/tty_ioctl.c:136 +> mkiss_receive_buf+0x12aa/0x1340 drivers/net/hamradio/mkiss.c:902 +> tty_ldisc_receive_buf+0x12f/0x170 drivers/tty/tty_buffer.c:465 +> paste_selection+0x346/0x470 drivers/tty/vt/selection.c:389 +> tioclinux+0x121/0x530 drivers/tty/vt/vt.c:3055 +> vt_ioctl+0x3f1/0x3a30 drivers/tty/vt/vt_ioctl.c:364 + +This is ioctl(TIOCL_PASTESEL). +Locks held on the path: sel_lock -> termios_rwsem + +> other info that might help us debug this: +> +> Chain exists of: +> &tty->termios_rwsem --> console_lock --> sel_lock + +Clearly. From the above, we have: + console_lock -> sel_lock + sel_lock -> termios_rwsem + termios_rwsem -> console_lock + +Fix this by reversing the console_lock -> sel_lock dependency in +ioctl(TIOCL_SETSEL). First, lock sel_lock, then console_lock. + +Signed-off-by: Jiri Slaby +Reported-by: syzbot+26183d9746e62da329b8@syzkaller.appspotmail.com +Fixes: 07e6124a1a46 ("vt: selection, close sel_buffer race") +Cc: stable +Link: https://lore.kernel.org/r/20200228115406.5735-2-jslaby@suse.cz +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/vt/selection.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +--- a/drivers/tty/vt/selection.c ++++ b/drivers/tty/vt/selection.c +@@ -204,7 +204,6 @@ static int __set_selection(const struct + pe = tmp; + } + +- mutex_lock(&sel_lock); + if (sel_cons != vc_cons[fg_console].d) { + clear_selection(); + sel_cons = vc_cons[fg_console].d; +@@ -250,10 +249,9 @@ static int __set_selection(const struct + break; + case TIOCL_SELPOINTER: + highlight_pointer(pe); +- goto unlock; ++ return 0; + default: +- ret = -EINVAL; +- goto unlock; ++ return -EINVAL; + } + + /* remove the pointer */ +@@ -275,7 +273,7 @@ static int __set_selection(const struct + else if (new_sel_start == sel_start) + { + if (new_sel_end == sel_end) /* no action required */ +- goto unlock; ++ return 0; + else if (new_sel_end > sel_end) /* extend to right */ + highlight(sel_end + 2, new_sel_end); + else /* contract from right */ +@@ -302,8 +300,7 @@ static int __set_selection(const struct + if (!bp) { + printk(KERN_WARNING "selection: kmalloc() failed\n"); + clear_selection(); +- ret = -ENOMEM; +- goto unlock; ++ return -ENOMEM; + } + kfree(sel_buffer); + sel_buffer = bp; +@@ -328,8 +325,7 @@ static int __set_selection(const struct + } + } + sel_buffer_lth = bp - sel_buffer; +-unlock: +- mutex_unlock(&sel_lock); ++ + return ret; + } + +@@ -337,9 +333,11 @@ int set_selection(const struct tiocl_sel + { + int ret; + ++ mutex_lock(&sel_lock); + console_lock(); + ret = __set_selection(v, tty); + console_unlock(); ++ mutex_unlock(&sel_lock); + + return ret; + } diff --git a/queue-4.14/x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch b/queue-4.14/x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch new file mode 100644 index 00000000000..82c62c9949a --- /dev/null +++ b/queue-4.14/x86-pkeys-manually-set-x86_feature_ospke-to-preserve-existing-changes.patch @@ -0,0 +1,56 @@ +From 735a6dd02222d8d070c7bb748f25895239ca8c92 Mon Sep 17 00:00:00 2001 +From: Sean Christopherson +Date: Wed, 26 Feb 2020 15:16:15 -0800 +Subject: x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes + +From: Sean Christopherson + +commit 735a6dd02222d8d070c7bb748f25895239ca8c92 upstream. + +Explicitly set X86_FEATURE_OSPKE via set_cpu_cap() instead of calling +get_cpu_cap() to pull the feature bit from CPUID after enabling CR4.PKE. +Invoking get_cpu_cap() effectively wipes out any {set,clear}_cpu_cap() +changes that were made between this_cpu->c_init() and setup_pku(), as +all non-synthetic feature words are reinitialized from the CPU's CPUID +values. + +Blasting away capability updates manifests most visibility when running +on a VMX capable CPU, but with VMX disabled by BIOS. To indicate that +VMX is disabled, init_ia32_feat_ctl() clears X86_FEATURE_VMX, using +clear_cpu_cap() instead of setup_clear_cpu_cap() so that KVM can report +which CPU is misconfigured (KVM needs to probe every CPU anyways). +Restoring X86_FEATURE_VMX from CPUID causes KVM to think VMX is enabled, +ultimately leading to an unexpected #GP when KVM attempts to do VMXON. + +Arguably, init_ia32_feat_ctl() should use setup_clear_cpu_cap() and let +KVM figure out a different way to report the misconfigured CPU, but VMX +is not the only feature bit that is affected, i.e. there is precedent +that tweaking feature bits via {set,clear}_cpu_cap() after ->c_init() +is expected to work. Most notably, x86_init_rdrand()'s clearing of +X86_FEATURE_RDRAND when RDRAND malfunctions is also overwritten. + +Fixes: 0697694564c8 ("x86/mm/pkeys: Actually enable Memory Protection Keys in the CPU") +Reported-by: Jacob Keller +Signed-off-by: Sean Christopherson +Signed-off-by: Borislav Petkov +Acked-by: Dave Hansen +Tested-by: Jacob Keller +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20200226231615.13664-1-sean.j.christopherson@intel.com +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/cpu/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -360,7 +360,7 @@ static __always_inline void setup_pku(st + * cpuid bit to be set. We need to ensure that we + * update that bit in this CPU's "cpu_info". + */ +- get_cpu_cap(c); ++ set_cpu_cap(c, X86_FEATURE_OSPKE); + } + + #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS