From patchwork Wed Jul 18 21:10:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10533281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7D5EA6053F for ; Wed, 18 Jul 2018 21:16:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C33929B74 for ; Wed, 18 Jul 2018 21:16:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FEFA29B87; Wed, 18 Jul 2018 21:16:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB4F829B74 for ; Wed, 18 Jul 2018 21:16:17 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RGXxjXT2mXWitE30LeCvkw37x52cHyyxCCqrkWyKttM=; b=BD6C1qftP40gZ2EOWhiaa+lB8d czDECgTvsGcQ9XA/zfytjl1ruKuOek1S0PmdJkyi5MVun0ATj1yJHqTXy3VJZYzg6gc45Vya4hayW Bvn+ooKoSufRSMpdJVDqbiWjMPduRoq8yDzln7SeS5HcL5edYxFzLaByoaos6NTVqTIqblPJ8eRlb wIz83TCA8ybR0vz5k/K04MKqOhPC5eEpDZjn7xx9FNBowOTHLurD5HLLpOckMSQ1dChHVT64RaLDr cs/wbVo1+Aw++SCpl6F9qTxjLZbpHl4IoneLzXookRIQo4JnUuIvCPuAGhvZqvkADTzFRAolE1s73 P1mVIYrA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fftnx-0005pb-Og; Wed, 18 Jul 2018 21:16:13 +0000 Received: from mail-qt0-f195.google.com ([209.85.216.195]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fftnu-0005ej-57 for linux-arm-kernel@lists.infradead.org; Wed, 18 Jul 2018 21:16:11 +0000 Received: by mail-qt0-f195.google.com with SMTP id y5-v6so5393884qti.12 for ; Wed, 18 Jul 2018 14:15:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JYOf584Ydg8gijpMp6qHyZQQNvlyScAA4CitiUdr5Zo=; b=maoi2MOsnoO77UGfMpjpBeNr9JeV+T4TC1nRC9oE+LBISl1iBmJh1Abh9966OXMcAF 3UqOcp0H0kWTc/0e2K9tUpSrBcHMNTuhFLIk88p0YcY+nwhvOK4yy6Zpk6KTtRhIWZbd QY9Ja/9a+SyTyDAZ8ltb9THHEf7+5GwSa+bnagyKvv8HzWqLmjaHlRx3LwS90kaNbgty MDiVI4WENJb2IcZ8KACmkwniNtHkBispBG8zie22F1mBflWkGL2TpR+rVFTJ5VFlHkhC KZYU1CKo4O4cGPhsIG9W7iI0XjBMiedbTTOwTRp13keqswrWDOeCaaxGdlH/FMhDEON5 zQCQ== X-Gm-Message-State: AOUpUlFyjDfIEyZg8ozwCmQc/aC0nwHy/yIz0mKQoY9hvZHMCmgarVUQ +YKP6jtT7few+fa361sBM0v/RA== X-Google-Smtp-Source: AAOMgpf/xAuzyFz6H0tuX4cNMeoZhOEuFZ0ESMy9azzLtFVumP/bsWIcoyyw+wQgKXpUepXhZPvJuw== X-Received: by 2002:aed:3534:: with SMTP id a49-v6mr6960492qte.244.1531948227972; Wed, 18 Jul 2018 14:10:27 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc:4eb2:6dae:ab32:e5b0]) by smtp.gmail.com with ESMTPSA id k3-v6sm4143463qta.37.2018.07.18.14.10.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 14:10:26 -0700 (PDT) From: Laura Abbott To: Alexander Popov , Kees Cook , Mark Rutland , Ard Biesheuvel Subject: [PATCH 2/2] arm64: Clear the stack Date: Wed, 18 Jul 2018 14:10:13 -0700 Message-Id: <20180718211013.14512-3-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718211013.14512-1-labbott@redhat.com> References: <20180718211013.14512-1-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180718_141610_195758_53ED24E8 X-CRM114-Status: GOOD ( 18.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-hardening@lists.openwall.com, Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, Laura Abbott , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Implementation of stackleak based heavily on the x86 version Signed-off-by: Laura Abbott Reviewed-by: Kees Cook --- Since last time: Minor style cleanups. Re-wrote check_alloca to correctly handle all stack types. While doing that, I also realized current_top_of_stack was incorrect so I fixed that as well. --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/processor.h | 17 ++++++++++++++ arch/arm64/kernel/entry.S | 7 ++++++ arch/arm64/kernel/process.c | 32 +++++++++++++++++++++++++++ arch/arm64/kvm/hyp/Makefile | 3 ++- drivers/firmware/efi/libstub/Makefile | 3 ++- include/linux/stackleak.h | 1 + 7 files changed, 62 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 42c090cf0292..216d36a49ab5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -96,6 +96,7 @@ config ARM64 select HAVE_ARCH_MMAP_RND_BITS select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index a73ae1e49200..4f3062ee22c6 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -266,5 +266,22 @@ extern void __init minsigstksz_setup(void); #define SVE_SET_VL(arg) sve_set_current_vl(arg) #define SVE_GET_VL() sve_get_current_vl() +/* + * For CONFIG_STACKLEAK + * + * These need to be macros because otherwise we get stuck in a nightmare + * of header definitions for the use of task_stack_page. + */ + +#define current_top_of_stack() \ +({ \ + unsigned long _low = 0; \ + unsigned long _high = 0; \ + \ + current_stack_type(current, current_stack_pointer, &_low, &_high); \ + _high; \ +}) +#define on_thread_stack() (on_task_stack(current, current_stack_pointer, NULL, NULL)) + #endif /* __ASSEMBLY__ */ #endif /* __ASM_PROCESSOR_H */ diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 28ad8799406f..67d12016063d 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -431,6 +431,11 @@ tsk .req x28 // current thread_info .text + .macro stackleak_erase +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase +#endif + .endm /* * Exception vectors. */ @@ -910,6 +915,7 @@ ret_fast_syscall: and x2, x1, #_TIF_WORK_MASK cbnz x2, work_pending enable_step_tsk x1, x2 + stackleak_erase kernel_exit 0 ret_fast_syscall_trace: enable_daif @@ -936,6 +942,7 @@ ret_to_user: cbnz x2, work_pending finish_ret_to_user: enable_step_tsk x1, x2 + stackleak_erase kernel_exit 0 ENDPROC(ret_to_user) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index e10bc363f533..904defa36689 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -493,3 +493,35 @@ void arch_setup_new_exec(void) { current->mm->context.flags = is_compat_task() ? MMCF_AARCH32 : 0; } + +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK +void __used stackleak_check_alloca(unsigned long size) +{ + unsigned long stack_left; + enum stack_type type; + unsigned long current_sp = current_stack_pointer; + unsigned long low, high; + + type = current_stack_type(current, current_sp, &low, &high); + BUG_ON(type == STACK_TYPE_UNKNOWN); + + stack_left = current_sp - low; + + if (size >= stack_left) { + /* + * Kernel stack depth overflow is detected, let's report that. + * If CONFIG_VMAP_STACK is enabled, we can safely use BUG(). + * If CONFIG_VMAP_STACK is disabled, BUG() handling can corrupt + * the neighbour memory. CONFIG_SCHED_STACK_END_CHECK calls + * panic() in a similar situation, so let's do the same if that + * option is on. Otherwise just use BUG() and hope for the best. + */ +#if !defined(CONFIG_VMAP_STACK) && defined(CONFIG_SCHED_STACK_END_CHECK) + panic("alloca() over the kernel stack boundary\n"); +#else + BUG(); +#endif + } +} +EXPORT_SYMBOL(stackleak_check_alloca); +#endif diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 4313f7475333..2fabc2dc1966 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -3,7 +3,8 @@ # Makefile for Kernel-based Virtual Machine module, HYP part # -ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING +ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ + $(DISABLE_STACKLEAK_PLUGIN) KVM=../../../../virt/kvm diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index a34e9290a699..25dd2a14560d 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -20,7 +20,8 @@ cflags-$(CONFIG_EFI_ARMSTUB) += -I$(srctree)/scripts/dtc/libfdt KBUILD_CFLAGS := $(cflags-y) -DDISABLE_BRANCH_PROFILING \ -D__NO_FORTIFY \ $(call cc-option,-ffreestanding) \ - $(call cc-option,-fno-stack-protector) + $(call cc-option,-fno-stack-protector) \ + $(DISABLE_STACKLEAK_PLUGIN) GCOV_PROFILE := n KASAN_SANITIZE := n diff --git a/include/linux/stackleak.h b/include/linux/stackleak.h index b911b973d328..08420ec6b7c3 100644 --- a/include/linux/stackleak.h +++ b/include/linux/stackleak.h @@ -5,6 +5,7 @@ #include #include +#include /* * Check that the poison value points to the unused hole in the * virtual memory map for your platform.