From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBou+0bX1kGWiXgvsqe2Tg9jlJbPXnzRYpan8xa57GZCShTu7e1vubpdNxZEWDXqDMEwCOejr ARC-Seal: i=1; a=rsa-sha256; t=1516292115; cv=none; d=google.com; s=arc-20160816; b=Q0iHuuf97FLGNQdZBf2EXWKdB2a7pzB9zu0GRCXiNgryKKcJ/sl/FXUJ/2zaGe8GBV L8bcRqXz+T0qBbAKrqSzWhCZJ/YXtId7G8f+Acg84UJkp0Ip438Y+6jM3AF9lA0mKoLS c18N6CuNC63HpdqZgMuQLhdskq/twvy1MPcd+/eKxMmguTgqj5YCMTA3tSO7OtygQ3Jr AcodxmwVBb7Dr5r9wc2E+12X9uprCpUoAytdxx4pxMix0HBc2NZ5zYq3C2gDbUZOEYK9 0KDoIJWHJaesY0EY7xcTuCTAKmZLFqeXp5WY/fkpiwazGhv6b2iXid4guXFdrlZwdOUv iS0A== 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=TFmV7vPonDs3hdGqUTDSUYPFSKtdJTPG9BaPjyv7SeQ=; b=Y6QizSHgfRcU7kwFuelVWxfWZEXPlLWgmN62cpNJpgNpk1HQB4I9qH4jGzUpTrFxEX HqCOZI4Sfr8+esqFvlw9l2zh3rvKtYcTzk10FSERKAEamIzFJBDdCmbKe6K3fNrU0jBX 62k7LnGOwtKCnlV9TZQ//GXtT9/ceTPu9pvH3t6IdwuJeiwo8+r+vJa/zui+hyeOJH9c x7uRDq6iVO7NCsopGCx5GVIlaxcRSzMiufdNVhGq+yIlT54Jdm5imnxImeLwSKKC3ds6 enw+XYrAFNLvNnmPABV4UxjOOEtUQh/kO4+tZNoyqpSb29nMIXZnIwif56Fkw5y102xR tPBw== 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 5E4A820836 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 v2 tip/master 2/3] kprobes/x86: Blacklist indirect thunk functions for kprobes Date: Fri, 19 Jan 2018 01:14:51 +0900 Message-Id: <151629209111.10241.5444852823378068683.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <151629203720.10241.17490679760505352230.stgit@devbox> References: <151629203720.10241.17490679760505352230.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?1589947521493193937?= 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 d3415dc30f82..dfb2ba91b670 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)