From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AB34C282C4 for ; Tue, 12 Feb 2019 16:11:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0832B2184E for ; Tue, 12 Feb 2019 16:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549987905; bh=8LZm9dNn3cys+j98zjuWUS3/y2IImFDWESUVHisUDgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qQ6OjMNqGHbxvKTrluYBdtCrBTU2+OY0v+JAi6iLNi4XUR4lhauyBrFAcMrJsyArY 8t0yEL2GVP510ZKP3lMr8gnBZX28gsaJ4nCEqhk2LABpK7cviGOoW1K1c2tg+jwBBz KDzGAurvESJcijCGFFoi7D5hUV40ifdO3A+Us6Aw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730934AbfBLQLn (ORCPT ); Tue, 12 Feb 2019 11:11:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:41190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730818AbfBLQLm (ORCPT ); Tue, 12 Feb 2019 11:11:42 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 11931217D9; Tue, 12 Feb 2019 16:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549987902; bh=8LZm9dNn3cys+j98zjuWUS3/y2IImFDWESUVHisUDgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ww9aOHU2HYU9VptgOQUDW6bhjdjzNg89Z94rSzPC6jEW60rs6tYf7N85gJMomQ4d5 T8qWKMBUGqTV6CnvygY76OmudUW/q1J7NCj30ekU/9ssg6Ka4WkjSDb9eK99ylz6SR 2tp1QPiPU5qbQ2+0WqrzIjZ+huSpFqTAj5cqM3nw= From: Masami Hiramatsu To: Ingo Molnar Cc: Masami Hiramatsu , peterz@infradead.org, Mathieu Desnoyers , linux-kernel , Andrea Righi , Steven Rostedt Subject: [PATCH -tip v3 01/10] x86/kprobes: Prohibit probing on optprobe template code Date: Wed, 13 Feb 2019 01:11:19 +0900 Message-Id: <154998787911.31052.15274376330136234452.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154998785011.31052.1475728497912659748.stgit@devbox> References: <154998785011.31052.1475728497912659748.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Prohibit probing on optprobe template code, since it is not a code but a template instruction sequence. If we modify this template, copied template must be broken. Signed-off-by: Masami Hiramatsu Fixes: 9326638cbee2 ("kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation") Cc: stable@vger.kernel.org --- arch/x86/kernel/kprobes/opt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 6adf6e6c2933..544bd41a514c 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -141,6 +141,11 @@ asm ( void optprobe_template_func(void); STACK_FRAME_NON_STANDARD(optprobe_template_func); +NOKPROBE_SYMBOL(optprobe_template_func); +NOKPROBE_SYMBOL(optprobe_template_entry); +NOKPROBE_SYMBOL(optprobe_template_val); +NOKPROBE_SYMBOL(optprobe_template_call); +NOKPROBE_SYMBOL(optprobe_template_end); #define TMPL_MOVE_IDX \ ((long)optprobe_template_val - (long)optprobe_template_entry)