From patchwork Thu Jan 11 02:03:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156595 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 4A623605BA for ; Thu, 11 Jan 2018 02:12:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3808A2874B for ; Thu, 11 Jan 2018 02:12:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C85D2874E; Thu, 11 Jan 2018 02:12:51 +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=unavailable 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 ACE3A2874B for ; Thu, 11 Jan 2018 02:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147AbeAKCMa (ORCPT ); Wed, 10 Jan 2018 21:12:30 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:40380 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754315AbeAKCJp (ORCPT ); Wed, 10 Jan 2018 21:09:45 -0500 Received: by mail-pg0-f65.google.com with SMTP id q12so1627206pgt.7 for ; Wed, 10 Jan 2018 18:09:45 -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=Y8wOaQenhPDXpfYr64+UYLO/jtGe9o88/mqZHyWGwNa83OnM/w9MB8q3jbFPALEr9V ihZLC80DGdpoph76T2YjqqSk7HRLZ1POmaCzd0Il/dJYvLAP7oEUNUmiHRnMUf0BDatU ai+CzHp5purojpli1PfQzIZD69ahEfF9mRN8E= 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=BbL+uI11Lm9KMkfhSthDDf7ddvrK2SK5w+wzfRtoZbe9KG/NQsd3nOPK7qkjkqidJN 5gnC1gVdEjqSgaztZOKoFnOHKABAbN/M2PZC1GhSkhaXnsM2dzEjazXbfIIvW+0Ajatg hoAdCY6Ps/ZWZC4xy0Q4zCJXqmNIDaWeQGyLGbxr7rpiKz7sGKLNaFfiNVXqtrWXshF7 6ok8Q5/xiAbVp4mtM3zR3vLW/XiQ9HkTMy04fEtgWVF8Po3uojzS/0zyg3IXCVd9W2fT WN8a3Gc+pNcBTctwlKdwL98No8kxFb29z9BKNM1NmvuoBTiZN1vArQxQGHQD+ZK7HIlz 6fuw== X-Gm-Message-State: AKGB3mKGs+nlbj2mTN3WS+I9/obrEsSCH/4KITfVKvfFbXiuKhUkH5XF RtYDxsd6Cr0dga6EIviDSGjayA== X-Google-Smtp-Source: ACJfBovS24igyT2XzoMcvjZNQqI9EoeH192KISCxqN3rC58Ta8jcmK0GwK0Ms/rwCeF/AbzsF+IGUg== X-Received: by 10.101.77.195 with SMTP id q3mr16451740pgt.436.1515636584898; Wed, 10 Jan 2018 18:09:44 -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 s65sm39799819pfk.7.2018.01.10.18.09.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:09:38 -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 32/38] x86: Implement thread_struct whitelist for hardened usercopy Date: Wed, 10 Jan 2018 18:03:04 -0800 Message-Id: <1515636190-24061-33-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 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. *