From: Peter Zijlstra <peterz@infradead.org>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
rostedt@goodmis.org
Cc: peterz@infradead.org, mingo@kernel.org, joel@joelfernandes.org,
gregkh@linuxfoundation.org, gustavo@embeddedor.com,
tglx@linutronix.de, paulmck@kernel.org, josh@joshtriplett.org,
mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com,
luto@kernel.org, tony.luck@intel.com, frederic@kernel.org,
dan.carpenter@oracle.com, mhiramat@kernel.org,
Dmitry Vyukov <dvyukov@google.com>
Subject: [PATCH v4 27/27] x86/int3: Ensure that poke_int3_handler() is not sanitized
Date: Fri, 21 Feb 2020 14:34:43 +0100 [thread overview]
Message-ID: <20200221134216.860887691@infradead.org> (raw)
In-Reply-To: 20200221133416.777099322@infradead.org
In order to ensure poke_int3_handler() is completely self contained --
we call this while we're modifying other text, imagine the fun of
hitting another INT3 -- ensure that everything is without sanitize
instrumentation.
Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Dmitry Vyukov <dvyukov@google.com>
---
arch/x86/kernel/alternative.c | 2 +-
arch/x86/kernel/traps.c | 2 +-
include/linux/compiler-clang.h | 7 +++++++
include/linux/compiler-gcc.h | 6 ++++++
include/linux/compiler.h | 5 +++++
include/linux/compiler_attributes.h | 1 +
6 files changed, 21 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -990,7 +990,7 @@ static __always_inline int patch_cmp(con
return 0;
}
-int notrace poke_int3_handler(struct pt_regs *regs)
+notrace __no_sanitize int poke_int3_handler(struct pt_regs *regs)
{
struct bp_patching_desc *desc;
struct text_poke_loc *tp;
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -502,7 +502,7 @@ dotraplinkage void do_general_protection
}
NOKPROBE_SYMBOL(do_general_protection);
-dotraplinkage notrace void do_int3(struct pt_regs *regs, long error_code)
+dotraplinkage notrace __no_sanitize void do_int3(struct pt_regs *regs, long error_code)
{
if (poke_int3_handler(regs))
return;
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
@@ -24,6 +24,13 @@
#define __no_sanitize_address
#endif
+#if __has_feature(undefined_sanitizer)
+#define __no_sanitize_undefined \
+ __atribute__((no_sanitize("undefined")))
+#else
+#define __no_sanitize_undefined
+#endif
+
/*
* Not all versions of clang implement the the type-generic versions
* of the builtin overflow checkers. Fortunately, clang implements
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -145,6 +145,12 @@
#define __no_sanitize_address
#endif
+#if __has_attribute(__no_sanitize_undefined__)
+#define __no_sanitize_undefined __attribute__((no_sanitize_undefined))
+#else
+#define __no_sanitize_undefined
+#endif
+
#if GCC_VERSION >= 50100
#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
#endif
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -199,6 +199,7 @@ void __read_once_size(const volatile voi
__READ_ONCE_SIZE;
}
+#define __no_kasan __no_sanitize_address
#ifdef CONFIG_KASAN
/*
* We can't declare function 'inline' because __no_sanitize_address confilcts
@@ -274,6 +275,10 @@ static __always_inline void __write_once
*/
#define READ_ONCE_NOCHECK(x) __READ_ONCE(x, 0)
+#define __no_ubsan __no_sanitize_undefined
+
+#define __no_sanitize __no_kasan __no_ubsan
+
static __no_kasan_or_inline
unsigned long read_word_at_a_time(const void *addr)
{
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@ -41,6 +41,7 @@
# define __GCC4_has_attribute___nonstring__ 0
# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
# define __GCC4_has_attribute___fallthrough__ 0
+# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
#endif
/*
next prev parent reply other threads:[~2020-02-21 13:34 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 13:34 [PATCH v4 00/27] tracing vs world Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 01/27] lockdep: Teach lockdep about "USED" <- "IN-NMI" inversions Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 15:08 ` Steven Rostedt
2020-02-21 15:08 ` Steven Rostedt
2020-02-21 20:25 ` Peter Zijlstra
2020-02-21 20:28 ` Steven Rostedt
2020-02-21 22:01 ` Frederic Weisbecker
2020-02-22 3:08 ` Joel Fernandes
2020-02-24 10:10 ` Peter Zijlstra
2020-02-25 2:12 ` Joel Fernandes
2020-02-21 13:34 ` [PATCH v4 02/27] hardirq/nmi: Allow nested nmi_enter() Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 22:21 ` Frederic Weisbecker
2020-02-24 12:13 ` Petr Mladek
2020-02-25 1:30 ` Frederic Weisbecker
2020-02-24 16:13 ` Peter Zijlstra
2020-02-25 3:09 ` Frederic Weisbecker
2020-02-25 15:41 ` Peter Zijlstra
2020-02-25 16:21 ` Frederic Weisbecker
2020-02-25 22:10 ` Frederic Weisbecker
2020-02-27 9:10 ` Peter Zijlstra
2020-02-27 13:34 ` Frederic Weisbecker
2020-02-27 13:34 ` Frederic Weisbecker
2020-02-21 13:34 ` [PATCH v4 03/27] x86/entry: Flip _TIF_SIGPENDING and _TIF_NOTIFY_RESUME handling Peter Zijlstra
2020-02-21 16:14 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 04/27] x86/mce: Delete ist_begin_non_atomic() Peter Zijlstra
2020-02-21 19:07 ` Andy Lutomirski
2020-02-21 23:40 ` Frederic Weisbecker
2020-02-21 13:34 ` [PATCH v4 05/27] x86: Replace ist_enter() with nmi_enter() Peter Zijlstra
2020-02-21 19:05 ` Andy Lutomirski
2020-02-21 20:22 ` Peter Zijlstra
2020-02-24 10:43 ` Peter Zijlstra
2020-02-24 16:27 ` Steven Rostedt
2020-02-24 16:34 ` Peter Zijlstra
2020-02-24 16:47 ` Steven Rostedt
2020-02-24 21:31 ` Peter Zijlstra
2020-02-24 22:02 ` Steven Rostedt
2020-02-26 10:25 ` Peter Zijlstra
2020-02-26 13:16 ` Peter Zijlstra
2020-02-26 10:27 ` Peter Zijlstra
2020-02-26 10:27 ` Peter Zijlstra
2020-02-26 15:20 ` Steven Rostedt
2020-03-07 1:53 ` Masami Hiramatsu
2020-03-07 1:53 ` Masami Hiramatsu
2020-02-21 13:34 ` [PATCH v4 06/27] x86/doublefault: Remove memmove() call Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 19:10 ` Andy Lutomirski
2020-02-21 13:34 ` [PATCH v4 07/27] rcu: Make RCU IRQ enter/exit functions rely on in_nmi() Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-26 0:23 ` Frederic Weisbecker
2020-02-21 13:34 ` [PATCH v4 08/27] rcu/kprobes: Comment why rcu_nmi_enter() is marked NOKPROBE Peter Zijlstra
2020-02-26 0:27 ` Frederic Weisbecker
2020-02-21 13:34 ` [PATCH v4 09/27] rcu: Rename rcu_irq_{enter,exit}_irqson() Peter Zijlstra
2020-02-21 20:21 ` Steven Rostedt
2020-02-24 10:24 ` Peter Zijlstra
2020-02-26 0:35 ` Frederic Weisbecker
2020-02-21 13:34 ` [PATCH v4 10/27] rcu: Mark rcu_dynticks_curr_cpu_in_eqs() inline Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 11/27] rcu,tracing: Create trace_rcu_{enter,exit}() Peter Zijlstra
2020-03-06 11:50 ` Peter Zijlstra
2020-03-06 12:40 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 12/27] sched,rcu,tracing: Avoid tracing before in_nmi() is correct Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 13/27] x86,tracing: Add comments to do_nmi() Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 14/27] perf,tracing: Prepare the perf-trace interface for RCU changes Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 15/27] tracing: Employ trace_rcu_{enter,exit}() Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 16/27] tracing: Remove regular RCU context for _rcuidle tracepoints (again) Peter Zijlstra
2020-03-06 10:43 ` Peter Zijlstra
2020-03-06 11:31 ` Peter Zijlstra
2020-03-06 11:31 ` Peter Zijlstra
2020-03-06 15:51 ` Alexei Starovoitov
2020-03-06 16:04 ` Mathieu Desnoyers
2020-03-06 17:55 ` Steven Rostedt
2020-03-06 18:45 ` Joel Fernandes
2020-03-06 18:59 ` Steven Rostedt
2020-03-06 19:14 ` Joel Fernandes
2020-03-06 19:14 ` Joel Fernandes
2020-03-06 20:22 ` Mathieu Desnoyers
2020-03-06 20:45 ` Steven Rostedt
2020-03-06 20:45 ` Steven Rostedt
2020-03-06 20:55 ` Mathieu Desnoyers
2020-03-06 21:06 ` Steven Rostedt
2020-03-06 23:10 ` Alexei Starovoitov
2020-03-06 17:21 ` Joel Fernandes
2020-02-21 13:34 ` [PATCH v4 17/27] perf,tracing: Allow function tracing when !RCU Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 18/27] x86/int3: Ensure that poke_int3_handler() is not traced Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 19/27] locking/atomics, kcsan: Add KCSAN instrumentation Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 20/27] asm-generic/atomic: Use __always_inline for pure wrappers Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 21/27] asm-generic/atomic: Use __always_inline for fallback wrappers Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 22/27] compiler: Simple READ/WRITE_ONCE() implementations Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 23/27] locking/atomics: Flip fallbacks and instrumentation Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 24/27] x86/int3: Avoid atomic instrumentation Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 25/27] lib/bsearch: Provide __always_inline variant Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` [PATCH v4 26/27] x86/int3: Inline bsearch() Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra
2020-02-21 13:34 ` Peter Zijlstra [this message]
2020-02-21 13:34 ` [PATCH v4 27/27] x86/int3: Ensure that poke_int3_handler() is not sanitized Peter Zijlstra
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=20200221134216.860887691@infradead.org \
--to=peterz@infradead.org \
--cc=dan.carpenter@oracle.com \
--cc=dvyukov@google.com \
--cc=frederic@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo@embeddedor.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).