From: Kees Cook <keescook@chromium.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kees Cook <keescook@chromium.org>,
Marios Pomonis <pomonis@google.com>,
Alexander Lobakin <alexandr.lobakin@intel.com>,
Kristen C Accardi <kristen.c.accardi@intel.com>,
Sami Tolvanen <samitolvanen@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ivan Babrou <ivan@cloudflare.com>,
Jiri Slaby <jirislaby@kernel.org>,
Julien Thierry <jthierry@redhat.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-hardening@vger.kernel.org
Subject: [PATCH] x86/unwind/orc: Handle kretprobes_trampoline
Date: Thu, 2 Sep 2021 19:13:26 -0700 [thread overview]
Message-ID: <20210903021326.206548-1-keescook@chromium.org> (raw)
From: Marios Pomonis <pomonis@google.com>
Fix a bug in the ORC unwinder when kretprobes has replaced a return
address with the address of `kretprobes_trampoline'. ORC mistakenly
assumes that the address in the stack is a return address and decrements
it by 1 in order to find the proper depth of the next frame.
This issue was discovered while testing the FG-KASLR series[0][1] and
running the live patching test[2] that was originally failing[3].
[0] https://lore.kernel.org/kernel-hardening/20200923173905.11219-1-kristen@linux.intel.com/
[1] https://github.com/KSPP/linux/issues/132
[2] https://github.com/lpechacek/qa_test_klp
[3] https://lore.kernel.org/lkml/alpine.LSU.2.21.2009251450260.13615@pobox.suse.cz/
Fixes: ee9f8fce9964 ("x86/unwind: Add the ORC unwinder")
Signed-off-by: Marios Pomonis <pomonis@google.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Alexander Lobakin <alexandr.lobakin@intel.com>
Cc: Kristen C Accardi <kristen.c.accardi@intel.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/x86/kernel/unwind_orc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
index a1202536fc57..8c5038b3b707 100644
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
@@ -7,6 +7,7 @@
#include <asm/unwind.h>
#include <asm/orc_types.h>
#include <asm/orc_lookup.h>
+#include <asm/kprobes.h>
#define orc_warn(fmt, ...) \
printk_deferred_once(KERN_WARNING "WARNING: " fmt, ##__VA_ARGS__)
@@ -414,6 +415,15 @@ static bool get_reg(struct unwind_state *state, unsigned int reg_off,
return false;
}
+static bool is_kretprobe_trampoline(unsigned long ip)
+{
+#ifdef CONFIG_KRETPROBES
+ if (ip == (unsigned long)&kretprobe_trampoline)
+ return true;
+#endif
+ return false;
+}
+
bool unwind_next_frame(struct unwind_state *state)
{
unsigned long ip_p, sp, tmp, orig_ip = state->ip, prev_sp = state->sp;
@@ -540,7 +550,7 @@ bool unwind_next_frame(struct unwind_state *state)
state->sp = sp;
state->regs = NULL;
state->prev_regs = NULL;
- state->signal = false;
+ state->signal = is_kretprobe_trampoline(state->ip);
break;
case UNWIND_HINT_TYPE_REGS:
--
2.30.2
next reply other threads:[~2021-09-03 2:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 2:13 Kees Cook [this message]
2021-09-04 17:55 ` Josh Poimboeuf
2021-09-05 7:57 ` Masami Hiramatsu
2021-09-24 17:17 ` Marios Pomonis
2021-10-11 21:03 ` Kees Cook
2021-10-14 1:41 ` Josh Poimboeuf
2021-10-14 4:52 ` Kees Cook
2021-10-14 10:16 ` Masami Hiramatsu
2021-10-21 15:13 ` Masami Hiramatsu
2021-10-29 18:19 ` Marios Pomonis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210903021326.206548-1-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=alexandr.lobakin@intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=ivan@cloudflare.com \
--cc=jirislaby@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=kristen.c.accardi@intel.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pomonis@google.com \
--cc=samitolvanen@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®