From patchwork Tue Jan 9 20:55:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153423 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 602CD60223 for ; Tue, 9 Jan 2018 21:04:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56BE42040D for ; Tue, 9 Jan 2018 21:04:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AE242097A; Tue, 9 Jan 2018 21:04:20 +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 C3C1C2040D for ; Tue, 9 Jan 2018 21:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755416AbeAIVEO (ORCPT ); Tue, 9 Jan 2018 16:04:14 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35432 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759686AbeAIU5L (ORCPT ); Tue, 9 Jan 2018 15:57:11 -0500 Received: by mail-pg0-f65.google.com with SMTP id d6so7757286pgv.2 for ; Tue, 09 Jan 2018 12:57:11 -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=SnghanDydgQiWkBVQnDglqviTcEmD/40/+04nFn5XG4=; b=Ly4ZPzP6M2N/CZsWHuhiNQCPYDeDWiVLS/z+flvfpjU9COluB0i64AmJLnLqKS+1Me cNU0D4JCJ7MOFWEHxtAglQu3dGPOy86M7Xt9NjOpxpFXRIoE0Xgjef2hjNL/KrG7wTR+ j5h67Y61+adiIhAcbqsnU8jtVD4NlKy01yQOg= 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=SnghanDydgQiWkBVQnDglqviTcEmD/40/+04nFn5XG4=; b=Vabrxf28UwqRWZl/tuHZTaIv61CnN7VNRfTPDM8DjBkKlUYpDJWv5jnO+nt93O6dsf XzNdvgIzqZrDu04kpjXc1F3XntcnE8Ef7Xxj4rieYDta3AQ0V8evvsVLNkmkzoGDPGsa jAeyYkShWJqtDw7y2ctTMb14l+D3RY7XUcHoSs1qczVhpqRHpzq6AbgEPKaoz4tQFw5z 1D9K6iuRcwlVkmT59LJi3ZkBqOBdtorOmCc16nFkNoJg4brEADir5RQWLAUM895wv3Rh 9YjJNIsZ8Uzd3+zNWwiWpRKE4ASDcfcutXEDTcrBW7A6o17crKr33xfXsX6KjNbIuTTo GbRA== X-Gm-Message-State: AKGB3mI3FCSsHAeWCmdzN7XUQtB2s1Zs1thQQ0vOuW++kK+4MFmL0x/A JZSYcUC6FflxrYXZlphcv8kNXw== X-Google-Smtp-Source: ACJfBotbzIJJCjGn+j7YwV72r6jmoE2bUJh4S1YJnqBQhAiSH2rqxBE8r07PIJRpg8IX7LM6mrmH0Q== X-Received: by 10.159.241.1 with SMTP id q1mr8868952plr.378.1515531430969; Tue, 09 Jan 2018 12:57:10 -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 q69sm33931834pfa.161.2018.01.09.12.57.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 12:57:10 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Borislav Petkov , Andy Lutomirski , Mathias Krause , Linus Torvalds , David Windsor , Alexander Viro , Andrew Morton , Christoph Hellwig , Christoph Lameter , "David S. Miller" , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christian Borntraeger , 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 29/36] x86: Implement thread_struct whitelist for hardened usercopy Date: Tue, 9 Jan 2018 12:55:58 -0800 Message-Id: <1515531365-37423-30-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> 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 This whitelists the FPU register state portion of the thread_struct for copying to userspace, instead of the default entire struct. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Borislav Petkov Cc: Andy Lutomirski Cc: Mathias Krause Signed-off-by: Kees Cook Acked-by: Rik van Riel --- arch/x86/Kconfig | 1 + arch/x86/include/asm/processor.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8eed3f94bfc7..9ac4ac1a856b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -116,6 +116,7 @@ config X86 select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT select HAVE_ARCH_COMPAT_MMAP_BASES if MMU && COMPAT select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index cc16fa882e3e..2b037b7fe0eb 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -492,6 +492,14 @@ struct thread_struct { */ }; +/* Whitelist the FPU state from the task_struct for hardened usercopy. */ +static inline void arch_thread_struct_whitelist(unsigned long *offset, + unsigned long *size) +{ + *offset = offsetof(struct thread_struct, fpu.state); + *size = fpu_kernel_xstate_size; +} + /* * Thread-synchronous status. *