From patchwork Wed Sep 20 20:45:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962541 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 7577160208 for ; Wed, 20 Sep 2017 20:54:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65E6929210 for ; Wed, 20 Sep 2017 20:54:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5AA5A29239; Wed, 20 Sep 2017 20:54:44 +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=-5.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, URIBL_BLACK 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 10B2C29210 for ; Wed, 20 Sep 2017 20:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752170AbdITUxH (ORCPT ); Wed, 20 Sep 2017 16:53:07 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:54650 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbdITUw6 (ORCPT ); Wed, 20 Sep 2017 16:52:58 -0400 Received: by mail-pg0-f53.google.com with SMTP id c137so2333189pga.11 for ; Wed, 20 Sep 2017 13:52:58 -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=x4S+mwfUnv9K1Bnlak1ybFpRjVXdf/L3fqTsDlwg50M=; b=OkJoDSIRrhJqpumEbdgIZUtTt0WTnFGcLHY08vORZXJnpk/j/KmhcAIKKdkFiFjvAx ioqT+4Da6tO6CJ3TbzmDxLOZBcU8KkJ6+iPOqUO5kf7Re8Tif63lwgN5JGhAFcmAtPth zpxasFNuBgw549mVSmMShMbbu/nmALPt5E/uw= 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=x4S+mwfUnv9K1Bnlak1ybFpRjVXdf/L3fqTsDlwg50M=; b=dn6zeUR05yg4QnhmD02NnMTSURJXiMa/oQ4kf3rYxqOczgPctotXXzDezqnE44HXgi rPhLNlAufhqV0AanH2NssO5MXuSIHDYysLcjFL74tdRFmgdd+Kh0EbDx5NISURbV4IHD Mpy5fEoBBazsNsADKwpbpnLOGMG3pavFb2mxdj0z/s720vnfB2wUbBepgexez8LzCc7A 9d71Z1rSp6m+KXtIIC2CGCa7PLUCPNbCnnckHNZvpqSKnx2W+8Ta3C/n5bJpqMcJkKzj VHrrhj08gBtG2aqolES/IerNaai9+aF3tQnwvc7qlG2pLDwFyKs6bDmsCYqq945BU3iA 50qg== X-Gm-Message-State: AHPjjUj2/dFBgcYTmWuEiOHG2DYliNC7ZlCEpKaQMbhvYD2H+BZbqAdl DdmfbZgOHox/U1jK2P+YxklFaw== X-Google-Smtp-Source: AOwi7QDdvNIGCSvzoIudS00ab5XQGn7EaTU8A7SYRyxuUPb1jMoqLe/+NlgZxYQX2Chlylk5j/9cJw== X-Received: by 10.99.125.82 with SMTP id m18mr3464839pgn.347.1505940778162; Wed, 20 Sep 2017 13:52:58 -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 133sm10278395pfy.2.2017.09.20.13.52.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:52:52 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Ingo Molnar , Andrew Morton , Thomas Gleixner , Andy Lutomirski , linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH v3 25/31] fork: Define usercopy region in thread_stack slab caches Date: Wed, 20 Sep 2017 13:45:31 -0700 Message-Id: <1505940337-79069-26-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 From: David Windsor In support of usercopy hardening, this patch defines a region in the thread_stack slab caches in which userspace copy operations are allowed. Since the entire thread_stack needs to be available to userspace, the entire slab contents are whitelisted. Note that the slab-based thread stack is only present on systems with THREAD_SIZE < PAGE_SIZE and !CONFIG_VMAP_STACK. cache object allocation: kernel/fork.c: alloc_thread_stack_node(...): return kmem_cache_alloc_node(thread_stack_cache, ...) dup_task_struct(...): ... stack = alloc_thread_stack_node(...) ... tsk->stack = stack; copy_process(...): ... dup_task_struct(...) _do_fork(...): ... copy_process(...) This region is known as the slab cache's usercopy region. Slab caches can now check that each copy operation involving cache-managed memory falls entirely within the slab's usercopy region. This patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Signed-off-by: David Windsor [kees: adjust commit log, split patch, provide usage trace] Cc: Ingo Molnar Cc: Andrew Morton Cc: Thomas Gleixner Cc: Andy Lutomirski Signed-off-by: Kees Cook Acked-by: Rik van Riel --- I wasn't able to test this, so anyone with a system that can try running with a large PAGE_SIZE and without VMAP_STACK would be appreciated. --- kernel/fork.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index dc1437f8b702..720109dc723a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -278,8 +278,9 @@ static void free_thread_stack(struct task_struct *tsk) void thread_stack_cache_init(void) { - thread_stack_cache = kmem_cache_create("thread_stack", THREAD_SIZE, - THREAD_SIZE, 0, NULL); + thread_stack_cache = kmem_cache_create_usercopy("thread_stack", + THREAD_SIZE, THREAD_SIZE, 0, 0, + THREAD_SIZE, NULL); BUG_ON(thread_stack_cache == NULL); } # endif