From: tip-bot for Alexey Dobriyan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, tglx@linutronix.de, luto@kernel.org,
peterz@infradead.org, jpoimboe@redhat.com, adobriyan@gmail.com,
torvalds@linux-foundation.org, dvlasenk@redhat.com,
linux-kernel@vger.kernel.org, h.peter.anvin@intel.com,
bp@alien8.de, brgerst@gmail.com, hpa@zytor.com
Subject: [tip:x86/pti] x86/asm: Pad assembly functions with INT3 instructions
Date: Mon, 14 May 2018 05:53:19 -0700 [thread overview]
Message-ID: <tip-51bad67ffbce0aaa44579f84ef5d05597054ec6a@git.kernel.org> (raw)
In-Reply-To: <20180507213755.GA32406@avx2>
Commit-ID: 51bad67ffbce0aaa44579f84ef5d05597054ec6a
Gitweb: https://git.kernel.org/tip/51bad67ffbce0aaa44579f84ef5d05597054ec6a
Author: Alexey Dobriyan <adobriyan@gmail.com>
AuthorDate: Tue, 8 May 2018 00:37:55 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 14 May 2018 11:43:03 +0200
x86/asm: Pad assembly functions with INT3 instructions
Use INT3 instead of NOP. All that padding between functions is
an illegal area, no legitimate code should jump into it.
I've checked x86_64 allyesconfig disassembly, all changes looks sane:
INT3 is only used after RET or unconditional JMP.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: H. Peter Anvin <h.peter.anvin@intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180507213755.GA32406@avx2
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/linkage.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 14caa9d9fb7f..c0b70bc1e659 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -18,7 +18,7 @@
name:
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)
-#define __ALIGN .p2align 4, 0x90
+#define __ALIGN .p2align 4, 0xCC
#define __ALIGN_STR __stringify(__ALIGN)
#endif
next prev parent reply other threads:[~2018-05-14 12:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-07 21:37 [PATCH] x86: pad assembly functions with INT3 Alexey Dobriyan
2018-05-07 21:41 ` hpa
2018-05-09 16:55 ` Alexey Dobriyan
2018-05-09 19:28 ` H. Peter Anvin
2018-05-10 16:39 ` David Laight
2018-05-11 18:53 ` H. Peter Anvin
2018-05-14 9:04 ` David Laight
2018-05-14 11:05 ` hpa
2018-05-15 6:54 ` Ingo Molnar
2018-05-15 6:59 ` hpa
2018-05-14 12:53 ` tip-bot for Alexey Dobriyan [this message]
2018-06-17 11:40 ` [tip:x86/pti] x86/asm: Pad assembly functions with INT3 instructions Mike Galbraith
2018-06-17 12:00 ` Borislav Petkov
2018-06-17 13:38 ` Mike Galbraith
2018-06-17 14:02 ` Mike Galbraith
2018-06-17 19:47 ` Borislav Petkov
2018-06-18 2:34 ` Mike Galbraith
2018-06-23 10:36 ` [PATCH] x86/crypto: Add missing RETs Borislav Petkov
2018-06-23 17:30 ` Ondrej Mosnáček
2018-06-24 7:11 ` Ingo Molnar
2018-06-24 7:12 ` Thomas Gleixner
2018-06-24 10:15 ` Borislav Petkov
2018-06-24 10:44 ` Alexey Dobriyan
2018-06-25 7:24 ` Ingo Molnar
2018-06-25 13:19 ` Josh Poimboeuf
2018-06-26 6:49 ` Ingo Molnar
2018-06-26 12:31 ` Josh Poimboeuf
2018-07-05 7:58 ` Ingo Molnar
2018-07-06 14:06 ` Josh Poimboeuf
2018-07-06 14:57 ` Ingo Molnar
2018-07-01 13:19 ` Herbert Xu
2018-07-01 15:24 ` Ondrej Mosnáček
2018-07-01 15:45 ` Herbert Xu
2018-06-19 11:27 ` [tip:x86/pti] x86/asm: Pad assembly functions with INT3 instructions David Laight
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=tip-51bad67ffbce0aaa44579f84ef5d05597054ec6a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=adobriyan@gmail.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=h.peter.anvin@intel.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).