From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBov5WXaLIdwyd7I+RrfsWNi41rYzXZGIy1aqLCsPOoER8ZOBSZmRUBBwCSeVUi3sDOxFuGcY ARC-Seal: i=1; a=rsa-sha256; t=1516377108; cv=none; d=google.com; s=arc-20160816; b=aCKttrk3rMbpNF3QPw/RseolpubbuQ9cWze6SmFYbLPzk0Y0dNGZ/mJm5HYx3aOKgl JA996wgx4AfjUFhl7m5ipSuYWlOjucu3OWaAd6MnRd/tLZbKqYRLQHrqzT1IG87nArAb a+diUZuLbJM61mQwsZfYCeqyiEQEorZ0TQCrdaYyQZhZXrWO1ygBpOvl5NhBmFfYNHiC v3eb3QTTqAG5iKLjrUR2iGyUqRuEZtmXIIkcSkZIqXgbm2+SNJ9atJxg1kYqXWBaLg8V Cm5ZjggWOUkFlazfeseILSpbcLSfxgfnWGp0Jj1gVVjrPcxdY8OVQuCAV/VRjGUOTNXo vMJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=precedence:content-disposition:content-transfer-encoding :mime-version:robot-unsubscribe:robot-id:git-commit-id:subject:to :references:in-reply-to:reply-to:cc:message-id:from:sender:date :arc-authentication-results; bh=tIbICYR8ltZ4VZHS0JAiEkxBKNHZqaiGrFhA13l0naw=; b=ltftJMGiNIqKwT6hpaDkYqDIAcmol8oFXFCgbii4aY9zMlUFr7DQpTy1TH4gz0RxMf Ko0CbHhLkCmXlyHyXZol8sU1BzW7NFR7bJPAOVtVVYaMW7V4YuGRWaO+JBVNf1YcQ6ts qjMEuFo6WqCWdc34HP/XywdW8Cz7/tSTUN158QrZ+2wRp9yswbnF3AER9yzxJW4HJTZw XMdYP8wdtmX6qm/IWlKmANOgFmckOote5RfrXYq6SSMWMOxAZD9ypAQT9VQQYQwCKDVX GjFggiHl4Tl++wHLul6c0OEY4aiyEtjPi99jt7u3LRlTjHfpRMhe/C+C9i94nbZHs06S siUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Date: Fri, 19 Jan 2018 07:47:47 -0800 Sender: tip tree robot From: tip-bot for Masami Hiramatsu Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, ak@linux.intel.com, ananth@linux.vnet.ibm.com, mhiramat@kernel.org, hpa@zytor.com, mingo@kernel.org, gregkh@linux-foundation.org, arjan@linux.intel.com, dwmw@amazon.co.uk Reply-To: dwmw@amazon.co.uk, arjan@linux.intel.com, gregkh@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, mhiramat@kernel.org, ananth@linux.vnet.ibm.com, ak@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <151629209111.10241.5444852823378068683.stgit@devbox> References: <151629209111.10241.5444852823378068683.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] kprobes/x86: Blacklist indirect thunk functions for kprobes Git-Commit-ID: c1804a236894ecc942da7dc6c5abe209e56cba93 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1589931601889515314?= X-GMAIL-MSGID: =?utf-8?q?1590036643330262112?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Commit-ID: c1804a236894ecc942da7dc6c5abe209e56cba93 Gitweb: https://git.kernel.org/tip/c1804a236894ecc942da7dc6c5abe209e56cba93 Author: Masami Hiramatsu AuthorDate: Fri, 19 Jan 2018 01:14:51 +0900 Committer: Thomas Gleixner CommitDate: Fri, 19 Jan 2018 16:31:28 +0100 kprobes/x86: Blacklist indirect thunk functions for kprobes Mark __x86_indirect_thunk_* functions as blacklist for kprobes because those functions can be called from anywhere in the kernel including blacklist functions of kprobes. Signed-off-by: Masami Hiramatsu Signed-off-by: Thomas Gleixner Acked-by: David Woodhouse Cc: Andi Kleen Cc: Peter Zijlstra Cc: Ananth N Mavinakayanahalli Cc: Arjan van de Ven Cc: Greg Kroah-Hartman Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/151629209111.10241.5444852823378068683.stgit@devbox --- arch/x86/lib/retpoline.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index d3415dc..dfb2ba9 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -25,7 +25,8 @@ ENDPROC(__x86_indirect_thunk_\reg) * than one per register with the correct names. So we do it * the simple and nasty way... */ -#define EXPORT_THUNK(reg) EXPORT_SYMBOL(__x86_indirect_thunk_ ## reg) +#define __EXPORT_THUNK(sym) _ASM_NOKPROBE(sym); EXPORT_SYMBOL(sym) +#define EXPORT_THUNK(reg) __EXPORT_THUNK(__x86_indirect_thunk_ ## reg) #define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg) GENERATE_THUNK(_ASM_AX)