From patchwork Wed Sep 20 20:45:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962515 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 9FDF260208 for ; Wed, 20 Sep 2017 20:53:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9332C29210 for ; Wed, 20 Sep 2017 20:53:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87FF029239; Wed, 20 Sep 2017 20:53:03 +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 B251729210 for ; Wed, 20 Sep 2017 20:53:02 +0000 (UTC) Received: (qmail 32453 invoked by uid 550); 20 Sep 2017 20:53:00 -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 32413 invoked from network); 20 Sep 2017 20:52:59 -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=TIO9yEqD/ACy+sSJTkZUlH9+FdVlt7R5A85gz6dLfIE=; b=VKhOr/8e+4p36fhU/rdNY9+gKLXidy/g4IRdL7VdVbEup7FB6SwDobbWjQ69F2nyqi 1nKFW4G0xZ+UasY+a65B567S6oC5f06DmWhWQPKhytT0ta1oX9Tc/DE66ab1QIbgjlnP eCuD1Qgb3LfoXIy8HRkTGjYZSb7KvyHbZO90E= 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=TIO9yEqD/ACy+sSJTkZUlH9+FdVlt7R5A85gz6dLfIE=; b=CSrKHXof+ZBLdTFnMxs3tjJ6oWpCEDwkjOlKhMXUNDCEO4/Lz2WhVZXKAoMqGSNKVd JQV+BNTMouL4UYSMIg+sesBnWlSOYuQneickJOqwDrgNuxNysY/6G9URHCCXVGVPu5nf wl8PvRYOfn7oyWPHADQXk2EmT+4RTp5wRJokR6pOM9BVnqLeNMtfPJtKl6QqhsrWTjO7 k9+6GcxqL5aIKLIbGkWgjBNA9eo6H87ZD76Ty5fmRtYlDyIpDjjh9CtS5I+MTI928AVR MQMV4MWEJCtmT6RqlNryJX9CYoPJsJTbqKWNz1QcDl7/hclhBFP3uTGCMoftkmn7CN0x yx7g== X-Gm-Message-State: AHPjjUikszJynFgEVvphwkMqevIvAE+MHROvB85Gkywaz2qrGmEwl0uy 56WtdEA0WPZ8bcVLEAF7yTTXeQ== X-Google-Smtp-Source: AOwi7QB/HEyBIJSiSs2cFJxXLELjSpOxcBXaP2aEHVK2B2TTBd+YM3iOeKcwz8uMGg8jQLHF7Fp4MA== X-Received: by 10.99.105.130 with SMTP id e124mr3440485pgc.420.1505940767514; Wed, 20 Sep 2017 13:52:47 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Catalin Marinas , Will Deacon , Christian Borntraeger , Ingo Molnar , James Morse , "Peter Zijlstra (Intel)" , Dave Martin , zijun_hu , linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com, David Windsor Date: Wed, 20 Sep 2017 13:45:34 -0700 Message-Id: <1505940337-79069-29-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505940337-79069-1-git-send-email-keescook@chromium.org> References: <1505940337-79069-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH v3 28/31] arm64: Implement thread_struct whitelist for hardened usercopy X-Virus-Scanned: ClamAV using ClamSMTP This whitelists the FPU register state portion of the thread_struct for copying to userspace, instead of the default entire structure. Cc: Catalin Marinas Cc: Will Deacon Cc: Christian Borntraeger Cc: Ingo Molnar Cc: James Morse Cc: "Peter Zijlstra (Intel)" Cc: Dave Martin Cc: zijun_hu Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/processor.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0df64a6a56d4..e190f9901aef 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -73,6 +73,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_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_VMAP_STACK diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 29adab8138c3..759c4d90ac7f 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -90,6 +90,14 @@ struct thread_struct { struct debug_info debug; /* debugging */ }; +/* Whitelist the fpsimd_state for copying to userspace. */ +static inline void arch_thread_struct_whitelist(unsigned long *offset, + unsigned long *size) +{ + *offset = offsetof(struct thread_struct, fpsimd_state); + *size = sizeof(struct fpsimd_state); +} + #ifdef CONFIG_COMPAT #define task_user_tls(t) \ ({ \