From patchwork Tue Jan 9 20:56:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153375 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 BD86C60223 for ; Tue, 9 Jan 2018 21:01:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B518625F3E for ; Tue, 9 Jan 2018 21:01:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B377E26255; Tue, 9 Jan 2018 21:01:39 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id B1FD025F3E for ; Tue, 9 Jan 2018 21:01:38 +0000 (UTC) Received: (qmail 9729 invoked by uid 550); 9 Jan 2018 20:57:36 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 9298 invoked from network); 9 Jan 2018 20:57:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7xfHfVUjFIj7TupED5lWUwNqXxqh/MUqfoqT4XIi7K4=; b=jCVS7jRe2clrlUAc2IhrKGbR4cPGDaE78uuNYPdPly8XQ2vrre5lA2yU25dKXKs9kC rmIgB+AHzlBMeUZQOoTrCe1BnPK4xMG9TsJEpvZ5q13JMdbQ6+bqaMnWqG3+AuuXO4Ku hAWTFLEJNH6tbjMMNj/8/irnNpkzqD3eQVaCk= 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=7xfHfVUjFIj7TupED5lWUwNqXxqh/MUqfoqT4XIi7K4=; b=iuIjRnpRR6kjSYVe0+N9X4GJcjaaZqYxKiEeRzlxtuGBEecmkzy4uIBci+3V3toodz 4DxxaDZJwIuNbrRwWedW/Hh+U0iVHhZqI/eQozCNCsE11s/NJYrFL6bq9Dmf+vX0C7tK 0XZ7bRzYYcHWfeND99jUegWFSJ4NfsKUw5vMOwsnlCwoRpKXrpOfSZIOsKTFhe1Eviud Os5eEH5lwdF2KXayNMWWGrteLgzQBF2smh/T4PxwvVei3Gx1rDflocoKwqIU+foDW91G H5Tzq/QDBpjUIYtcHK9Fl1zVX0xkWFiriTXB6+XyN7V1KOnKroUIdOPRMTc1vZSTM92h KuAg== X-Gm-Message-State: AKGB3mKG2W50AKxAVarjSZNEoiJwO6mrtyxyTUJuhg0U4ZB4i52CfMvK FmyAriscuvIOhWkKtDmX0XWlUg== X-Google-Smtp-Source: ACJfBou3q519eSq6yafSzRyxuGQNeKG3Ws6Ller99Iky5hMHUBQsWzby5g4n0pei4tvb1ypm2UIaqA== X-Received: by 10.101.80.74 with SMTP id k10mr13538098pgo.246.1515531432027; Tue, 09 Jan 2018 12:57:12 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Russell King , Ingo Molnar , Christian Borntraeger , "Peter Zijlstra (Intel)" , linux-arm-kernel@lists.infradead.org, Linus Torvalds , David Windsor , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , "David S. Miller" , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christoffer Dall , Dave Kleikamp , Jan Kara , Luis de Bethencourt , Marc Zyngier , Rik van Riel , Matthew Garrett , linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Date: Tue, 9 Jan 2018 12:56:00 -0800 Message-Id: <1515531365-37423-32-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515531365-37423-1-git-send-email-keescook@chromium.org> References: <1515531365-37423-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH 31/36] arm: Implement thread_struct whitelist for hardened usercopy X-Virus-Scanned: ClamAV using ClamSMTP ARM does not carry FPU state in the thread structure, so it can declare no usercopy whitelist at all. Cc: Russell King Cc: Ingo Molnar Cc: Christian Borntraeger Cc: "Peter Zijlstra (Intel)" Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook --- arch/arm/Kconfig | 1 + arch/arm/include/asm/processor.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 51c8df561077..3ea00d65f35d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -50,6 +50,7 @@ config ARM select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) + select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARM_SMCCC if CPU_V7 select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32 diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 338cbe0a18ef..01a41be58d43 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -45,6 +45,13 @@ struct thread_struct { struct debug_info debug; }; +/* Nothing needs to be usercopy-whitelisted from thread_struct. */ +static inline void arch_thread_struct_whitelist(unsigned long *offset, + unsigned long *size) +{ + *offset = *size = 0; +} + #define INIT_THREAD { } #define start_thread(regs,pc,sp) \