From patchwork Thu Jan 11 02:03:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156463 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 B478A605BA for ; Thu, 11 Jan 2018 02:04:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A42AE2856D for ; Thu, 11 Jan 2018 02:04:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9886C286D4; Thu, 11 Jan 2018 02:04:27 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D42B2856D for ; Thu, 11 Jan 2018 02:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbeAKCEX (ORCPT ); Wed, 10 Jan 2018 21:04:23 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33645 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853AbeAKCDh (ORCPT ); Wed, 10 Jan 2018 21:03:37 -0500 Received: by mail-pg0-f65.google.com with SMTP id i196so1622693pgd.0 for ; Wed, 10 Jan 2018 18:03:36 -0800 (PST) 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=keW/NYMCdqwbmqVX37Iam/L3jaU5oUn9dANY+YkZJcm60BrTkLBFu4iM5EnQSxdsda /fEKVWG/ngse/QMVao0LJ2//hgx9CpaYdG8ykfrxPAmD+OXKAHsb0S9lcVk1CSN0VRIC bcrRpRF3qM8HtkwmLIftJAJvizYkdqurCi3Jw= 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=j2e806/MuU3UeSMZBzXcEuSgUxf1v1CDGoXIbPPMxtEa5+AJ9JTzu4CcaiD4yLw+mI dxycF/E+3rNg8wwH+Cg/Ppc82iQdOCrQ5ZD1/qgYOYzZPaSosHPkCGVvRKlDPiXrLnqJ Ai9RURCFUliO1mhPVTwiuzRimrSB/z/ZzGkYFGkVh9QObbLaNoCfBlqqPb4TBH3qomAb MIyRDtaG6+jN+RbgVXiO90Gp25xJJKfrX1G3USh8LpPZqpjWz9UF1OTx+9AgoqVWwtUR jRB+UQ0JgMTAD6t+ZKuAFrCUWbLSOgxyDgBW+1F7UBhnpBJOdDg+U3ILrsR0mkE1z3H2 NUwA== X-Gm-Message-State: AKGB3mJO6gm525NuUtN3Lv+rTKn8NZ8GrdgFNYTH5a5DDTXTVKGc3EDC 49+q6klhNI7AyuzE/QCo8T2ORA== X-Google-Smtp-Source: ACJfBot0B7YaBJrK0JZO8fg2sGHmV81RgRz7RooG0LavGA/ra2ttdmHioMsqUs5F1XS1bczyJKM3Jg== X-Received: by 10.98.16.132 with SMTP id 4mr11403014pfq.42.1515636216533; Wed, 10 Jan 2018 18:03:36 -0800 (PST) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id b1sm30869173pgq.17.2018.01.10.18.03.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:03:32 -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 Subject: [PATCH 34/38] arm: Implement thread_struct whitelist for hardened usercopy Date: Wed, 10 Jan 2018 18:03:06 -0800 Message-Id: <1515636190-24061-35-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515636190-24061-1-git-send-email-keescook@chromium.org> References: <1515636190-24061-1-git-send-email-keescook@chromium.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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) \