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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 CF452CA9EB5 for ; Mon, 21 Oct 2019 09:19:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FDC220659 for ; Mon, 21 Oct 2019 09:19:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="E7TKNCWA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="lhQih9us" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FDC220659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Mime-Version:References:In-Reply-To: Message-Id:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ISN83XvDuXPuYSz49Eorknc37IJ2E8vLP1qm92jmXI4=; b=E7TKNCWAheiMiI rRIx5l9PlmAmAcJvr1JlFZ3Z6S5Qcgfh/OiQ7UCPh1QySWyTPagJzeJS6D/Gf3hNhAXYqOFCov4Mp 7cpL6JZiUFP44D7gHY0vx8d4a4OsveCr3UgUKVVKQhoHm5RbytFDNWvlgVwy15vfV6PN0qYUkwx/x 9NGBdAtlIWCgqnkMzRnSqbDIDan8oapOeLR4qSOqxbFkM3UMSGl4t1gWjMNeqEZz3Afa2JIZmZCRq VJs018l14gclxYQO5qfBJxXjjSNOhUxJqjPXiFNeqla9PaWX/IGF1qd1sPw8p5PPuQ7hsMdDe8vQf VUQeCzVBHk9yd0J/P0uQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMTqe-0005sx-46; Mon, 21 Oct 2019 09:19:32 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMTmu-00030I-C6 for linux-arm-kernel@lists.infradead.org; Mon, 21 Oct 2019 09:15:42 +0000 Received: from devnote2 (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 7DC7C20873; Mon, 21 Oct 2019 09:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571649340; bh=u7f4Jzabn9wcp0GNP0aGJ8DQeoDFxKaLNe/XQiZCh3g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=lhQih9usCWZFyrqRYHSlhFjhOzTd6Wskq7PvLRgeauFSlUAkOb9TjhVjGtywqv+TS uKESoqrQxNZATz+pnxmw/nrASmiA1G+0A1g5ydaZznLD8x5PPdC3hgLEcGiiZ8fgsI gz8KGed6lyCT5vhLpEHmLLOxU3dFyX7GelMJ6vXM= Date: Mon, 21 Oct 2019 18:15:34 +0900 From: Masami Hiramatsu To: Steven Rostedt Subject: Re: [PATCH 11/18] kprobes: disable kretprobes with SCS Message-Id: <20191021181534.4d8edb330e6fb19cd7f7e39f@kernel.org> In-Reply-To: <20191018130429.5df61f6b@gandalf.local.home> References: <20191018161033.261971-1-samitolvanen@google.com> <20191018161033.261971-12-samitolvanen@google.com> <20191018130429.5df61f6b@gandalf.local.home> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_021541_028357_101A1B8E X-CRM114-Status: GOOD ( 18.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Ard Biesheuvel , Catalin Marinas , kernel-hardening@lists.openwall.com, Nick Desaulniers , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Masami Hiramatsu , Sami Tolvanen , Laura Abbott , Will Deacon , Dave Martin , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 18 Oct 2019 13:04:29 -0400 Steven Rostedt wrote: > > [ Added Masami ] > > On Fri, 18 Oct 2019 09:10:26 -0700 > Sami Tolvanen wrote: > > > With CONFIG_KRETPROBES, function return addresses are modified to > > redirect control flow to kretprobe_trampoline. This is incompatible with > > return address protection. > > > > Signed-off-by: Sami Tolvanen > > --- > > arch/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/Kconfig b/arch/Kconfig > > index a222adda8130..4646e3b34925 100644 > > --- a/arch/Kconfig > > +++ b/arch/Kconfig > > @@ -171,7 +171,7 @@ config ARCH_USE_BUILTIN_BSWAP > > > > config KRETPROBES > > def_bool y > > - depends on KPROBES && HAVE_KRETPROBES > > + depends on KPROBES && HAVE_KRETPROBES && ROP_PROTECTION_NONE > > Again, this belongs in the arch code. +1, below patch (from Steve) looks good to me. Thank you, > > -- Steve > > > > > config USER_RETURN_NOTIFIER > > bool > > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 41a9b4257b72..65557d7e6b5e 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -166,7 +166,7 @@ config ARM64 > select HAVE_STACKPROTECTOR > select HAVE_SYSCALL_TRACEPOINTS > select HAVE_KPROBES > - select HAVE_KRETPROBES > + select HAVE_KRETPROBES if ROP_PROTECTION_NONE > select HAVE_GENERIC_VDSO > select IOMMU_DMA if IOMMU_SUPPORT > select IRQ_DOMAIN -- Masami Hiramatsu _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel