Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp639651img; Fri, 22 Mar 2019 05:42:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdlv+JTxdVCunOAoLU/rD/un3Nl8mVZ6/Q/c5fLeP0nqnf8v+CJgh/0br/vLuK3me1hdL9 X-Received: by 2002:a17:902:45a5:: with SMTP id n34mr9537320pld.127.1553258548306; Fri, 22 Mar 2019 05:42:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553258548; cv=none; d=google.com; s=arc-20160816; b=n5M/QAiRBRp7ezGxwejFGhgO87Utw04DbZf85BYL3Gpk+IeocX7bSiJnhy6s4tAgvs ajmv3sVTwLFVBCquGPn6dEpr+X3sEmneBpYkYVQijcGeAaBFnLXClHjwcHggpoe3KnfU VxllxDWe9ubgLblPe1NjJRr5e0hwyYJzWcqzqFsHu0bvJ0m5Hi9A+TR+SbJg7usbLvLh 0vZl4UhZ+8jwzhMlH6n55PIkebybENjfU3zp44//NLArTKPPRSplS9kM+TgrZLbwWK2t wg/4GHSEjUnEgZQPNPodHMQPsrov6EcqKeFcqcgDKMyH5M+rAudoveCQtSqojBtmPruy 82kA== 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=3pDbeizcI1mEK8Mc1dJO+ZLl1OZqKwDgjd3XwQzxDZY=; b=fPqk2yaBzKtoGbqg30WPo+AkhMFzB2qrnbJFRMuu2i9Lxi+S7t0V25El9uHv+/z44g UWSbJDJlKXPzsA39cb5qvpvJasBboDfZ93pqiQ7qs6/zmTqPEPiRs8kusqTDpIdCRMpi A95HdBE0LR52LHulPpP49e3enfA5LUJKcptxRGu3+RsUWgELhws6AizZmQWy3ba/IwKN NPWclq9xsxPCGkcMJnWxuoHKB6uDfOd46/y4zv6Jf7fn2hlvRw4Yh28VBUNj9jCrOkgN 5Yyl7J4EOoDbDuZKR8zAX5EXHZDvslnUOXm5HwWeHqVzcwt1jbln0rPHrwNV0bt/Bj57 1UPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OAAnOTAK; 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 m184si6661124pfb.73.2019.03.22.05.42.10; Fri, 22 Mar 2019 05:42:28 -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=OAAnOTAK; 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 S1730716AbfCVMFa (ORCPT + 99 others); Fri, 22 Mar 2019 08:05:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:43922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388813AbfCVMFZ (ORCPT ); Fri, 22 Mar 2019 08:05:25 -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 29600206C0; Fri, 22 Mar 2019 12:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256324; bh=UCea0k/P3+ho5gJTRm7680R94NEB879XT11g8ZtgIk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OAAnOTAK/MF1ssTm63caNkHEhwRWHgyFxj3L5t70YqYDzd2O/JpCGEPbwBB8HK/Hb L7+6Snc8tT/d45rKMedNibVMR1a7yt5rCNgbpQB8OVa/kURqLOJ6PaUDeYyulYFAd3 jZqAbdCIhrEdx08UJHuqA5iwzLxnDsB7Moed+/t0= 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.19 176/280] x86/kprobes: Prohibit probing on optprobe template code Date: Fri, 22 Mar 2019 12:15:29 +0100 Message-Id: <20190322111325.658451873@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@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.19-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)