From: "tip-bot2 for Masami Hiramatsu" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, "Peter Zijlstra (Intel)" <peterz@infradead.org>, Juergen Gross <jgross@suse.com>, x86@kernel.org, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Ingo Molnar <mingo@kernel.org>, Stefano Stabellini <sstabellini@kernel.org>, Andrew Cooper <andrew.cooper3@citrix.com>, Borislav Petkov <bp@alien8.de>, xen-devel@lists.xenproject.org, Randy Dunlap <rdunlap@infradead.org>, Josh Poimboeuf <jpoimboe@redhat.com>, linux-kernel@vger.kernel.org Subject: [tip: x86/core] x86: kprobes: Prohibit probing on instruction which has emulate prefix Date: Fri, 18 Oct 2019 12:48:18 -0000 [thread overview] Message-ID: <157140289814.29376.7139596484011081680.tip-bot2@tip-bot2> (raw) In-Reply-To: <156777566048.25081.6296162369492175325.stgit@devnote2> The following commit has been merged into the x86/core branch of tip: Commit-ID: 004e8dce9c5595697951f7cd0e9f66b35c92265e Gitweb: https://git.kernel.org/tip/004e8dce9c5595697951f7cd0e9f66b35c92265e Author: Masami Hiramatsu <mhiramat@kernel.org> AuthorDate: Fri, 06 Sep 2019 22:14:20 +09:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Thu, 17 Oct 2019 21:31:57 +02:00 x86: kprobes: Prohibit probing on instruction which has emulate prefix Prohibit probing on instruction which has XEN_EMULATE_PREFIX or KVM's emulate prefix. Since that prefix is a marker for Xen and KVM, if we modify the marker by kprobe's int3, that doesn't work as expected. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Juergen Gross <jgross@suse.com> Cc: x86@kernel.org Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Borislav Petkov <bp@alien8.de> Cc: xen-devel@lists.xenproject.org Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lkml.kernel.org/r/156777566048.25081.6296162369492175325.stgit@devnote2 --- arch/x86/kernel/kprobes/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 43fc13c..4f13af7 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -351,6 +351,10 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn) kernel_insn_init(insn, dest, MAX_INSN_SIZE); insn_get_length(insn); + /* We can not probe force emulate prefixed instruction */ + if (insn_has_emulate_prefix(insn)) + return 0; + /* Another subsystem puts a breakpoint, failed to recover */ if (insn->opcode.bytes[0] == BREAKPOINT_INSTRUCTION) return 0;
WARNING: multiple messages have this Message-ID (diff)
From: "tip-bot2 for Masami Hiramatsu" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, "Peter Zijlstra \(Intel\)" <peterz@infradead.org>, Andrew Cooper <andrew.cooper3@citrix.com>, x86@kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov <bp@alien8.de>, Masami Hiramatsu <mhiramat@kernel.org>, Josh Poimboeuf <jpoimboe@redhat.com>, xen-devel@lists.xenproject.org, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Randy Dunlap <rdunlap@infradead.org>, Ingo Molnar <mingo@kernel.org> Subject: [Xen-devel] [tip: x86/core] x86: kprobes: Prohibit probing on instruction which has emulate prefix Date: Fri, 18 Oct 2019 12:48:18 -0000 [thread overview] Message-ID: <157140289814.29376.7139596484011081680.tip-bot2@tip-bot2> (raw) In-Reply-To: <156777566048.25081.6296162369492175325.stgit@devnote2> The following commit has been merged into the x86/core branch of tip: Commit-ID: 004e8dce9c5595697951f7cd0e9f66b35c92265e Gitweb: https://git.kernel.org/tip/004e8dce9c5595697951f7cd0e9f66b35c92265e Author: Masami Hiramatsu <mhiramat@kernel.org> AuthorDate: Fri, 06 Sep 2019 22:14:20 +09:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Thu, 17 Oct 2019 21:31:57 +02:00 x86: kprobes: Prohibit probing on instruction which has emulate prefix Prohibit probing on instruction which has XEN_EMULATE_PREFIX or KVM's emulate prefix. Since that prefix is a marker for Xen and KVM, if we modify the marker by kprobe's int3, that doesn't work as expected. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Juergen Gross <jgross@suse.com> Cc: x86@kernel.org Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Borislav Petkov <bp@alien8.de> Cc: xen-devel@lists.xenproject.org Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lkml.kernel.org/r/156777566048.25081.6296162369492175325.stgit@devnote2 --- arch/x86/kernel/kprobes/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 43fc13c..4f13af7 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -351,6 +351,10 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn) kernel_insn_init(insn, dest, MAX_INSN_SIZE); insn_get_length(insn); + /* We can not probe force emulate prefixed instruction */ + if (insn_has_emulate_prefix(insn)) + return 0; + /* Another subsystem puts a breakpoint, failed to recover */ if (insn->opcode.bytes[0] == BREAKPOINT_INSTRUCTION) return 0; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-10-18 12:48 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-06 13:13 [PATCH -tip v4 0/4] x86: kprobes: Prohibit kprobes on Xen/KVM emulate prefixes Masami Hiramatsu 2019-09-06 13:13 ` [Xen-devel] " Masami Hiramatsu 2019-09-06 13:13 ` [PATCH -tip v4 1/4] x86/asm: Allow to pass macros to __ASM_FORM() Masami Hiramatsu 2019-09-06 13:13 ` [Xen-devel] " Masami Hiramatsu 2019-10-18 12:48 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu 2019-10-18 12:48 ` [Xen-devel] " tip-bot2 for Masami Hiramatsu 2019-09-06 13:13 ` [PATCH -tip v4 2/4] x86: xen: kvm: Gather the definition of emulate prefixes Masami Hiramatsu 2019-09-06 13:13 ` [Xen-devel] " Masami Hiramatsu 2019-10-18 12:48 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu 2019-10-18 12:48 ` [Xen-devel] " tip-bot2 for Masami Hiramatsu 2019-09-06 13:14 ` [PATCH -tip v4 3/4] x86: xen: insn: Decode Xen and KVM emulate-prefix signature Masami Hiramatsu 2019-09-06 13:14 ` [Xen-devel] " Masami Hiramatsu 2019-10-18 12:48 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu 2019-10-18 12:48 ` [Xen-devel] " tip-bot2 for Masami Hiramatsu 2019-09-06 13:14 ` [PATCH -tip v4 4/4] x86: kprobes: Prohibit probing on instruction which has emulate prefix Masami Hiramatsu 2019-09-06 13:14 ` [Xen-devel] " Masami Hiramatsu 2019-10-18 12:48 ` tip-bot2 for Masami Hiramatsu [this message] 2019-10-18 12:48 ` [Xen-devel] [tip: x86/core] " tip-bot2 for Masami Hiramatsu 2019-09-17 6:14 ` [PATCH -tip v4 0/4] x86: kprobes: Prohibit kprobes on Xen/KVM emulate prefixes Masami Hiramatsu 2019-09-17 6:14 ` [Xen-devel] " Masami Hiramatsu 2019-10-09 12:31 ` Peter Zijlstra 2019-10-09 12:31 ` [Xen-devel] " Peter Zijlstra 2019-10-17 3:26 ` Masami Hiramatsu 2019-10-17 3:26 ` [Xen-devel] " Masami Hiramatsu 2019-10-17 7:29 ` Peter Zijlstra 2019-10-17 7:29 ` [Xen-devel] " 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=157140289814.29376.7139596484011081680.tip-bot2@tip-bot2 \ --to=tip-bot2@linutronix.de \ --cc=andrew.cooper3@citrix.com \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@alien8.de \ --cc=jgross@suse.com \ --cc=jpoimboe@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mhiramat@kernel.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=rdunlap@infradead.org \ --cc=sstabellini@kernel.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.