Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp619752img; Fri, 22 Mar 2019 05:17:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqx8BJPS9LFELzY2IEC0g/0So50tAHwjCCufpA/VcTzSv/SdLouXP49HrpeF0lVsB/Q/3HX2 X-Received: by 2002:a63:720f:: with SMTP id n15mr8325960pgc.216.1553257065403; Fri, 22 Mar 2019 05:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553257065; cv=none; d=google.com; s=arc-20160816; b=NSvTeFOSVvjRlLp5YNPqlSfGAMBJ5rEv02mecHEg1yvf5ImffObuXb+UdKwD6JFTa5 B2iaeLRQXliZZNzC82A/6Y1LUAlLWnfSd0qFcNeF1aF9UhbuprJh9Sdpj+Jf3iMYocTV wZyEMeh932/A20nBp+pl/mKx5HLIgM9zIXGLixC2kv+h5GDJEomslRX+Rx91tedfrvgc 2kh7bf5gqhppp7JxRXret6g6PoeEHEkdo5hh6SpWx/ELx/AWK9EYvvzkRhOhWhU1pKOP brkzC0WbUMF7cScULTIhmz7ldR1py6NkcjR3sEj9pfRuGJf+F3h4BZNz53N3lVeUBGJA zK1Q== 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=DxtF306yKcHI6aV5YSZTM+v/6n+LcZ33vF8DMAtuN/U=; b=zFAOJa5g/bmXTem9pDfvhkSWgQuoTg5MyrR4+UBgE7HMOOKSy9kFCz2SSbcPsZIHXo SnJErIO3XhImP+23fbpL03JxlgLB5v7sW12Cz5b1vDCvdBWcH+ylCUcZln4wPfslM3v9 GUKh+06VDbM9IW1SaCxB5uV1XiNwEU9HrbTl0iTePGGC2EKZFm8x0llnnGipw5cCaekJ PPRH+PZJBwi2/hJCYDM8zJITiR/2nI3rjbrWDEu9u9r4S25dXYRN0bSDA/NY4NRan99s PFche3u3i4ZiHoDuh0iQTZTqqLP1YfpNTZFf2wsN3mTTZyJxt4KTx3vdXGUnP8QeyJGj qUBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UWpr5zMt; 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 w3si6455870pfw.94.2019.03.22.05.17.30; Fri, 22 Mar 2019 05:17:45 -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=UWpr5zMt; 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 S2390265AbfCVMQp (ORCPT + 99 others); Fri, 22 Mar 2019 08:16:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:55458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390027AbfCVMQn (ORCPT ); Fri, 22 Mar 2019 08:16:43 -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 646BE2082C; Fri, 22 Mar 2019 12:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257002; bh=kFgImT/uRNeTgqaQiPqPI8/kOiGLu/6EWoCcJokvKWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWpr5zMtyx4lkmxnDpYArNPsBfbCneMtLMdNZn08emn3EqEYp5wqW0EJdfV/2Msrp 6iLt6HbCiC9BZOPsS1gJ1/S2ef/LrbIcj/6jTml1e2EoiPZafLR7O5Kv/aMsQbCBkk Bqr5IidFhQt4vkE/HEws7gZFe3VaVdwd3xnpdB1k= 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 5.0 103/238] x86/kprobes: Prohibit probing on optprobe template code Date: Fri, 22 Mar 2019 12:15:22 +0100 Message-Id: <20190322111304.618039750@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@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 5.0-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)