Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp649510img; Fri, 22 Mar 2019 05:55:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaO9Fx0y+8TzA8Y0mvfvVTSgXQmt2zhhsX0tVvL17hbO2m/wVv5D07x68Rh/v4JCSAcEdj X-Received: by 2002:a17:902:44a4:: with SMTP id l33mr9406113pld.292.1553259353459; Fri, 22 Mar 2019 05:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553259353; cv=none; d=google.com; s=arc-20160816; b=wO1tjBIV+qucqMcggFk1J2a15hFNyiSBEd6OXctYRbKLrv/8soEhrek3PwlY874YQy l71Pco2Qtg3d1T/MkSZyLE1DAG1CnpeLun38OvsWWbNqUZufvvrHyQSvkEmES7XLINac YycGc2LNFQJH0ibxrn+i/F6e0Wdbyi1pRxSxQWTcQIhCXv5yJg2IprvHIeBGFR1e0h9h 1/+JYeoV1XAO15PLx9Imrd5CGXC+47tPEs+wCQWJAw2uuzDlgQOAXVlIohYFsE2e3aw2 Kv9xteAB6EU4JRBQuxXMkbm/zItB9CzVMLQ3Osd01oIoQ+TX6RGegclW8VFXyN2OzAJI 20Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Z9LzCgpYK75pHvaaUOh1p9gmmNjFY69abrmU1DI/+0k=; b=sgDGYV1FQ3vclKw3Ah7FeEqFhcMzjD+G9046BNHEFmOJrFSVIBt4PqfYr4lLIhkiMf luLtmLZQ5Z0o0uW81yMwIHnoh1LNrGKyo70iyD0IKZGGiITJnizW3MM1bwFN+aGuFJon s9JHu9VUR+x52ryz3G4jcpYR0dgNfeDN3yfSjZH18MJqtcfc3dwZPZ4ZmfLMgh8dHKVD JSbhvh0YG7vzSd79DXGJFbv3T56/WdLxb4vQv5douCaWRhhRk+MUP8DnM6Ut7iomxj2n ZuRSSXKqhqZsudlCiwkS3qf8EZxl3x8qjis7oOgkb8nR+Jh/SIrlc4MBxSICI5gzBL3b npdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BpCszFfK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l7si7135047plb.219.2019.03.22.05.55.38; Fri, 22 Mar 2019 05:55:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BpCszFfK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732795AbfCVLvj (ORCPT + 99 others); Fri, 22 Mar 2019 07:51:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:55430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732548AbfCVLvc (ORCPT ); Fri, 22 Mar 2019 07:51:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4A54820850; Fri, 22 Mar 2019 11:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255491; bh=xDgHpRN7nLFApHjUfkuWu9afxzdwaUx5V1hZCjGwV9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BpCszFfKpwKmrzTfPYcmBithKQ5X73WH+Rz8KmX/b8rOhwHz/IleAtL3mE2oMICFM zKgykh9JzWd6bv69cK/18JrehUGgrerLTmf1tSE1ExX/Jeb0DhwEcEXmYEeWE/BwNp 2I2dBq9tVrs4CmCQ9doK/lr0o51iyuE2BlaZY5QU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , Alexander Shishkin , Andrea Righi , Arnaldo Carvalho de Melo , Jiri Olsa , Linus Torvalds , Mathieu Desnoyers , Peter Zijlstra , Steven Rostedt , Thomas Gleixner , Ingo Molnar Subject: [PATCH 4.14 108/183] x86/kprobes: Prohibit probing on optprobe template code Date: Fri, 22 Mar 2019 12:15:36 +0100 Message-Id: <20190322111249.537515040@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111241.819468003@linuxfoundation.org> References: <20190322111241.819468003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu commit 0192e6535ebe9af68614198ced4fd6d37b778ebf upstream. 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 Cc: Alexander Shishkin Cc: Andrea Righi Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mathieu Desnoyers Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: stable@vger.kernel.org Fixes: 9326638cbee2 ("kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation") Link: http://lkml.kernel.org/r/154998787911.31052.15274376330136234452.stgit@devbox Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/kprobes/opt.c | 5 +++++ 1 file changed, 5 insertions(+) --- 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)