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: 9962599 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 409D460208 for ; Wed, 20 Sep 2017 21:00:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07B3725F3E for ; Wed, 20 Sep 2017 21:00:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF5DF29204; Wed, 20 Sep 2017 21:00:36 +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 0282029252 for ; Wed, 20 Sep 2017 21:00:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbdITUwu (ORCPT ); Wed, 20 Sep 2017 16:52:50 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:43384 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751933AbdITUws (ORCPT ); Wed, 20 Sep 2017 16:52:48 -0400 Received: by mail-pf0-f176.google.com with SMTP id y29so2126944pff.0 for ; Wed, 20 Sep 2017 13:52:47 -0700 (PDT) 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=Fo7XGk20aju87LJVoQPcz6rwnJE70nBC31yyoq2Ir/XdiWGZCI60DjP/QvtatwtmP+ r0MVDMpQHc5W5wMAlhCdwIPtSVoaG1yLjItA5qw88oi+LhwhyZ0BwPJxvKuV9ZLOW9aD 3PA82zQBQZes4dSVe5oxy7mn2gVKJQhN618ZzcwVnnOj/9fW72cnKnE5CGWuFgNSfnuT DNcrfC/1lZzJ6HS7dn7wblchjnnDgoJ9dqlnr0pUry2tvSDqIZUlYNA/9m4Gdwo1qgiS hSjLg7xKcZ5fkDpw0/vg9CgemGe946xT2mT7w/TRv6qrMOmf5mjaWoXf1CFJ/YUKKEka hEfA== X-Gm-Message-State: AHPjjUh45ZYGWxlWJjSKNZkdGBlkaozgC0MLId3Fq9OShvnPQgnDuQBQ 5Lcx1STamaAaPEmVkltcOxELtQ== 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) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id d124sm8414572pfc.42.2017.09.20.13.52.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:52:46 -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 Subject: [PATCH v3 28/31] arm64: Implement thread_struct whitelist for hardened usercopy 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> 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 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) \ ({ \