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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 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 41F88CA9EA9 for ; Fri, 18 Oct 2019 17:04:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16BC921835 for ; Fri, 18 Oct 2019 17:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505190AbfJRREd (ORCPT ); Fri, 18 Oct 2019 13:04:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:50700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436745AbfJRREc (ORCPT ); Fri, 18 Oct 2019 13:04:32 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 D16F12064A; Fri, 18 Oct 2019 17:04:30 +0000 (UTC) Date: Fri, 18 Oct 2019 13:04:29 -0400 From: Steven Rostedt To: Sami Tolvanen Cc: Will Deacon , Catalin Marinas , Ard Biesheuvel , Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , Nick Desaulniers , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Masami Hiramatsu Subject: Re: [PATCH 11/18] kprobes: disable kretprobes with SCS Message-ID: <20191018130429.5df61f6b@gandalf.local.home> In-Reply-To: <20191018161033.261971-12-samitolvanen@google.com> References: <20191018161033.261971-1-samitolvanen@google.com> <20191018161033.261971-12-samitolvanen@google.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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. -- 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