linux-kernel - [tip:x86/urgent] ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-34a477e5297cbaa6ecc6e17c042a866e1cbe80d6@git.kernel.org>
Date:   Fri, 14 Apr 2017 02:51:52 -0700
From:   tip-bot for Josh Poimboeuf <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     rostedt@...dmis.org, bp@...en8.de, lenb@...nel.org,
        mingo@...nel.org, pmenzel@...gen.mpg.de, hpa@...or.com,
        rjw@...ysocki.net, jpoimboe@...hat.com, tglx@...utronix.de,
        linux-kernel@...r.kernel.org
Subject: [tip:x86/urgent] ftrace/x86: Fix triple fault with graph tracing
 and suspend-to-ram

Commit-ID:  34a477e5297cbaa6ecc6e17c042a866e1cbe80d6
Gitweb:     http://git.kernel.org/tip/34a477e5297cbaa6ecc6e17c042a866e1cbe80d6
Author:     Josh Poimboeuf <jpoimboe@...hat.com>
AuthorDate: Thu, 13 Apr 2017 17:53:55 -0500
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 14 Apr 2017 11:48:51 +0200

ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram

On x86-32, with CONFIG_FIRMWARE and multiple CPUs, if you enable function
graph tracing and then suspend to RAM, it will triple fault and reboot when
it resumes.

The first fault happens when booting a secondary CPU:

startup_32_smp()
  load_ucode_ap()
    prepare_ftrace_return()
      ftrace_graph_is_dead()
        (accesses 'kill_ftrace_graph')

The early head_32.S code calls into load_ucode_ap(), which has an an
ftrace hook, so it calls prepare_ftrace_return(), which calls
ftrace_graph_is_dead(), which tries to access the global
'kill_ftrace_graph' variable with a virtual address, causing a fault
because the CPU is still in real mode.

The fix is to add a check in prepare_ftrace_return() to make sure it's
running in protected mode before continuing.  The check makes sure the
stack pointer is a virtual kernel address.  It's a bit of a hack, but
it's not very intrusive and it works well enough.

For reference, here are a few other (more difficult) ways this could
have potentially been fixed:

- Move startup_32_smp()'s call to load_ucode_ap() down to *after* paging
  is enabled.  (No idea what that would break.)

- Track down load_ucode_ap()'s entire callee tree and mark all the
  functions 'notrace'.  (Probably not realistic.)

- Pause graph tracing in ftrace_suspend_notifier_call() or bringup_cpu()
  or __cpu_up(), and ensure that the pause facility can be queried from
  real mode.

Reported-by: Paul Menzel <pmenzel@...gen.mpg.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com>
Tested-by: Paul Menzel <pmenzel@...gen.mpg.de>
Reviewed-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
Cc: "Rafael J . Wysocki" <rjw@...ysocki.net>
Cc: linux-acpi@...r.kernel.org
Cc: Borislav Petkov <bp@...en8.de>
Cc: stable@...nel.org
Cc: Len Brown <lenb@...nel.org>
Link: http://lkml.kernel.org/r/5c1272269a580660703ed2eccf44308e790c7a98.1492123841.git.jpoimboe@redhat.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86/kernel/ftrace.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index cbd73eb..0e5ceac 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -989,6 +989,18 @@ void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
 	unsigned long return_hooker = (unsigned long)
 				&return_to_handler;

+	/*
+	 * When resuming from suspend-to-ram, this function can be indirectly
+	 * called from early CPU startup code while the CPU is in real mode,
+	 * which would fail miserably.  Make sure the stack pointer is a
+	 * virtual address.
+	 *
+	 * This check isn't as accurate as virt_addr_valid(), but it should be
+	 * good enough for this purpose, and it's fast.
+	 */
+	if (unlikely((long)__builtin_frame_address(0) >= 0))
+		return;
+
 	if (unlikely(ftrace_graph_is_dead()))
 		return;