From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBovc6VyhPkdUYq2wXC5U0wUTv6jl41VIRGgh9/CKzlYgK/pBYXB4/hqSE23PvwYLUYPdJk4Z ARC-Seal: i=1; a=rsa-sha256; t=1516276933; cv=none; d=google.com; s=arc-20160816; b=HCNM65R7TKoGqmDkVa+DvsmTJQEXWQfEFWkL3l2/MsNk4DFZI006GkXkxOedkECD2V 43JXeN+i4OZp4MDNMxdxUI7izuj77dv+5lsTAILh5XMa0nzS+4d2H2lmnJtWF4T03bAi TpuLzUr7h6zwO7jI4LcLn/3Zx0HB7RitUsn1vzxV5mrbP/Qz+w9YcH5O1iNglnTMMVqZ Qeug0gjNqUbUCkoCO8A+gK6OFMxuir0t9CZcXEmAOGAdDOGoc+zLBh1QXMr+wYL4jgCb QWaKknkerLWiJIo8xFY6vcMRgnjhEa4PYQCdtvM73fyYnwyXv5pGuuZQwWHg1irsptxj tQ5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=ttbYeHNj+Ii8S1962GdBlwvYc793fLqcf9F/a680ydY=; b=q0aubmZTiTwZ8cghEgA6uPwcq/sJOqRPILciKfOnVYmPUtLJ1w2l8796qts76dcAsH QS7/zEW5tF3gmgEqJo3j17FbMlHp2ah9T9pss8Unn8lIrYLmX0OCdkA6tJziFKgExHj/ z0WJGmuzEIHSWLdu/hYjLzSkLpelXKcGYiXhuH6+kEHQnkq9pgZPws6UYA2YlO0HFYtd rxRiYFdFLeq2qeSqUP9+1DWOfVxZ9Dn4z3PTR5mGUGxhoD7/sUvEUl6mQzda2PsiFy6T hafcLzCmz9/2x0vy7Wcjfsd0fANVeLk2nFCcmRgC1x52DTZiIHCp2Fem//EwWiKa5bvi /wlw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of mhiramat@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=mhiramat@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mhiramat@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=mhiramat@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C74D20837 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: Ingo Molnar , David Woodhouse Cc: Masami Hiramatsu , linux-kernel@vger.kernel.org, Andi Kleen , Greg Kroah-Hartman , Arjan van de Ven , Peter Zijlstra , Ananth N Mavinakayanahalli , Thomas Gleixner , "H . Peter Anvin" Subject: [PATCH v1 tip/master 2/3] kprobes/x86: Blacklist indirect thunk functions for kprobes Date: Thu, 18 Jan 2018 21:01:48 +0900 Message-Id: <151627690859.24682.1058211027484209346.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <151627684798.24682.2979775081582774869.stgit@devbox> References: <151627684798.24682.2979775081582774869.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1589931601889515314?= X-GMAIL-MSGID: =?utf-8?q?1589931601889515314?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- 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 cb45c6cb465f..9d964f6795b8 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)