From patchwork Tue Jan 9 20:55:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153351 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 E7D94602CA for ; Tue, 9 Jan 2018 21:00:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E070D26223 for ; Tue, 9 Jan 2018 21:00:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEE402624A; Tue, 9 Jan 2018 21:00:15 +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 5EC1E2624C for ; Tue, 9 Jan 2018 21:00:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760031AbeAIU6f (ORCPT ); Tue, 9 Jan 2018 15:58:35 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:43371 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756234AbeAIU5V (ORCPT ); Tue, 9 Jan 2018 15:57:21 -0500 Received: by mail-pg0-f68.google.com with SMTP id f14so6243768pga.10 for ; Tue, 09 Jan 2018 12:57:21 -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=tSYhrcy/CkL5mToN++XEZZoZ5fVb+0b1X+bWqCwu4eM=; b=ka0QUISdddTINTZxD2HBwfvTXR3CsCeGSMumkOkEGABj6zprXGWr/1aIiM9Md5OOdO Rn+RVreJJdoK98QSy38ek/pWGCRzAiUSlJ6kRt2bJkUOK0s4TcyLIJkVDhQyR+CPbMfr 7ifKRCzlSmuP/hI4/VKm0yGjWL8kKU6TfywYI= 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=tSYhrcy/CkL5mToN++XEZZoZ5fVb+0b1X+bWqCwu4eM=; b=X0VUP6CGqeUxvMTEPoKdwfKzQOT392OMKFfrtRLMkfMv9Sku4O1Gmci1nNk6hTpxu/ 4xTMVulmEb1MxIJfryxUT/e4FK80pKm92IQjXP4V0SCUWf/PcihnUlWrenb4yLZWEsMy EulHW5DumWVCJzK0XzwQkpjbN0LW2Ldwt5BGkEL9D7HVtyhyPPNywVsfpz1635abCLfu bGNFay86Lc7iexTrFjBn9pkRG1QUN4qalOl5RAkENt9Pd/djLcEty4UxSyUxgCQWNV0+ BdBaL/W3HrWCw6VZpsEF3IwGcuD7jnqGXdMDjUGaZrBVjzYi/ZYtMktI3mWJvqE9LfY2 7LEw== X-Gm-Message-State: AKGB3mID+yGkPvw8dC47Mlh2k9/w4N7FlZmPhePluG032K0OcRFX7ZRo 0fRLSt7jlEOr4aYigoy4MdZGnA== X-Google-Smtp-Source: ACJfBouH3U8MinPJAxsOVTol0MtL3/aum+z66YFJ1sMSIocXodRXyycAcVMeGxDSB+cvvh/CGjFJkA== X-Received: by 10.101.75.73 with SMTP id k9mr13457545pgt.335.1515531441092; Tue, 09 Jan 2018 12:57:21 -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 n22sm27331742pgd.86.2018.01.09.12.56.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 12:57:18 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Alexander Viro , linux-fsdevel@vger.kernel.org, Linus Torvalds , Andrew Morton , Andy Lutomirski , 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-arch@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH 07/36] dcache: Define usercopy region in dentry_cache slab cache Date: Tue, 9 Jan 2018 12:55:36 -0800 Message-Id: <1515531365-37423-8-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 From: David Windsor When a dentry name is short enough, it can be stored directly in the dentry itself (instead in a separate kmalloc allocation). These dentry short names, stored in struct dentry.d_iname and therefore contained in the dentry_cache slab cache, need to be coped to userspace. cache object allocation: fs/dcache.c: __d_alloc(...): ... dentry = kmem_cache_alloc(dentry_cache, ...); ... dentry->d_name.name = dentry->d_iname; example usage trace: filldir+0xb0/0x140 dcache_readdir+0x82/0x170 iterate_dir+0x142/0x1b0 SyS_getdents+0xb5/0x160 fs/readdir.c: (called via ctx.actor by dir_emit) filldir(..., const char *name, ...): ... copy_to_user(..., name, namlen) fs/libfs.c: dcache_readdir(...): ... next = next_positive(dentry, p, 1) ... dir_emit(..., next->d_name.name, ...) In support of usercopy hardening, this patch defines a region in the dentry_cache slab cache in which userspace copy operations are allowed. This region is known as the slab cache's usercopy region. Slab caches can now check that each dynamic 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 hunks for kmalloc-specific things moved later] [kees: adjust commit log, provide usage trace] Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Kees Cook --- fs/dcache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 5c7df1df81ff..92ad7a2168e1 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -3601,8 +3601,9 @@ static void __init dcache_init(void) * but it is probably not worth it because of the cache nature * of the dcache. */ - dentry_cache = KMEM_CACHE(dentry, - SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD|SLAB_ACCOUNT); + dentry_cache = KMEM_CACHE_USERCOPY(dentry, + SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD|SLAB_ACCOUNT, + d_iname); /* Hash may have been set up in dcache_init_early */ if (!hashdist)