{"id":816513,"url":"http://patchwork.ozlabs.org/api/patches/816513/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-28-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505940337-79069-28-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:33","name":"[v3,27/31] x86: Implement thread_struct whitelist for hardened usercopy","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"c3c29b4706882dac9509f139b664c225ed538463","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-28-git-send-email-keescook@chromium.org/mbox/","series":[{"id":4231,"url":"http://patchwork.ozlabs.org/api/series/4231/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4231","date":"2017-09-20T20:45:22","name":"Hardened usercopy whitelisting","version":3,"mbox":"http://patchwork.ozlabs.org/series/4231/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816513/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816513/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"dxDjjsJK\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBx11tk1z9s8J\n\tfor ;\n\tThu, 21 Sep 2017 07:01:09 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751872AbdITVAY (ORCPT );\n\tWed, 20 Sep 2017 17:00:24 -0400","from mail-pf0-f182.google.com ([209.85.192.182]:54167 \"EHLO\n\tmail-pf0-f182.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752034AbdITUwt (ORCPT\n\t); Wed, 20 Sep 2017 16:52:49 -0400","by mail-pf0-f182.google.com with SMTP id x78so2110669pff.10\n\tfor ; Wed, 20 Sep 2017 13:52:49 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tp10sm9623906pfd.152.2017.09.20.13.52.45\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:52:46 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=3R7ykMo1QDcA1DAxnObdCr3lt2DuNxplS/riESPOmSw=;\n\tb=dxDjjsJKG6tiuJdzmEL/zoU3X2165vcSwqEhop0ZLqP8hfPf4qjbIECJQxebRfYulx\n\t+SJyEU/5q/oXGrAnkGdaFJpRURBTwcEzi5BDsSbA0Spfo4Ulv5ULOYKHxTaKKPann02U\n\tWvvuAbE+vSVwiGJTtezQJ3+baW1SY95yizyZs=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=3R7ykMo1QDcA1DAxnObdCr3lt2DuNxplS/riESPOmSw=;\n\tb=kG8lrTa35sA6oq6zYsRpivDuSe9mjgC/nCNoZsCPBrP+YfNB0FPyvsVRYp7c/4FlVD\n\tndCq76GdqZmGiIajCStookNhIzNCBkzl6TTwDarEHpK37IhFoLNLOHgT9Cdg1dJUdttO\n\tnmxzpjf3YEmwfhSoLo+AM7bGaSO7dENtbEw2KNOb/W64LK2PdAGe/8T32cZTy2CpUd+q\n\tw4EGt14dadX3o5m0noER3FJksaKb0jvIiEkMxDwRw/opo584YnWV2hkkJatA8G0rnLXw\n\tdl+J7zGEU7RHUqjN4YtK6yHckPLLCxRWZZIpY7xXqRE7I4dRrOMBZYYjkhU7iDDgCJs7\n\tnT7w==","X-Gm-Message-State":"AHPjjUinGXSv/2p9ztiR05ZVlHzwJQLL7AjluZn3OBoi9RCuppLU/hjt\n\tRAuSyhCv2HsiStRtbdElcruJ2Q==","X-Google-Smtp-Source":"AOwi7QBt43NnJbfqZ+d48EKxeh/ATGvZttRyHBJZhh7heLCV726eY9KvHKoAfJmtZ58m/O14HVWhXg==","X-Received":"by 10.84.240.196 with SMTP id l4mr3311743plt.443.1505940768866; \n\tWed, 20 Sep 2017 13:52:48 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , Thomas Gleixner ,\n\tIngo Molnar ,\n\t\"H. Peter Anvin\" , x86@kernel.org,\n\tBorislav Petkov , Andy Lutomirski ,\n\tMathias Krause ,\n\tlinux-fsdevel@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-mm@kvack.org, kernel-hardening@lists.openwall.com,\n\tDavid Windsor ","Subject":"[PATCH v3 27/31] x86: Implement thread_struct whitelist for\n\thardened usercopy","Date":"Wed, 20 Sep 2017 13:45:33 -0700","Message-Id":"<1505940337-79069-28-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"This whitelists the FPU register state portion of the thread_struct for\ncopying to userspace, instead of the default entire struct.\n\nCc: Thomas Gleixner \nCc: Ingo Molnar \nCc: \"H. Peter Anvin\" \nCc: x86@kernel.org\nCc: Borislav Petkov \nCc: Andy Lutomirski \nCc: Mathias Krause \nSigned-off-by: Kees Cook \nAcked-by: Rik van Riel \n---\n arch/x86/Kconfig | 1 +\n arch/x86/include/asm/processor.h | 8 ++++++++\n 2 files changed, 9 insertions(+)","diff":"diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\nindex 971feac13506..6642e8eaff45 100644\n--- a/arch/x86/Kconfig\n+++ b/arch/x86/Kconfig\n@@ -114,6 +114,7 @@ config X86\n \tselect HAVE_ARCH_MMAP_RND_COMPAT_BITS\tif MMU && COMPAT\n \tselect HAVE_ARCH_COMPAT_MMAP_BASES\tif MMU && COMPAT\n \tselect HAVE_ARCH_SECCOMP_FILTER\n+\tselect HAVE_ARCH_THREAD_STRUCT_WHITELIST\n \tselect HAVE_ARCH_TRACEHOOK\n \tselect HAVE_ARCH_TRANSPARENT_HUGEPAGE\n \tselect HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64\ndiff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h\nindex 3fa26a61eabc..868235b967ed 100644\n--- a/arch/x86/include/asm/processor.h\n+++ b/arch/x86/include/asm/processor.h\n@@ -488,6 +488,14 @@ struct thread_struct {\n \t */\n };\n \n+/* Whitelist the FPU state from the task_struct for hardened usercopy. */\n+static inline void arch_thread_struct_whitelist(unsigned long *offset,\n+\t\t\t\t\t\tunsigned long *size)\n+{\n+\t*offset = offsetof(struct thread_struct, fpu.state);\n+\t*size = fpu_kernel_xstate_size;\n+}\n+\n /*\n * Thread-synchronous status.\n *\n","prefixes":["v3","27/31"]}