From patchwork Thu Jan 11 02:02:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156695 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 2D36260231 for ; Thu, 11 Jan 2018 02:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18EB1286D4 for ; Thu, 11 Jan 2018 02:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09BBA286D6; Thu, 11 Jan 2018 02:20:35 +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 AA206286D4 for ; Thu, 11 Jan 2018 02:20:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754342AbeAKCUO (ORCPT ); Wed, 10 Jan 2018 21:20:14 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:43481 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754247AbeAKCTi (ORCPT ); Wed, 10 Jan 2018 21:19:38 -0500 Received: by mail-pg0-f66.google.com with SMTP id f14so1638448pga.10 for ; Wed, 10 Jan 2018 18:19:37 -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=YKnoLn5y8s2UpHwNQGuC3A7deJajJSC7iR0HkqVn8JQ=; b=MOL98VGcZHEZNVX1V3JbtDAUtQ6LHsvv2omifn9BL58h6d4AoBAuJ0ur9bXptgHNA3 i6/+jVvO+kEHqS4pd5T71PhbsRRMsBmihBb7EU2yDgzsNRN0uTcF0ukPM4J18nJb0nBM la8Nmy3mC+aWorkBEXq+SncVVp3zuhhmyv9a0= 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=YKnoLn5y8s2UpHwNQGuC3A7deJajJSC7iR0HkqVn8JQ=; b=XBUhLg/OMVOwmMqdcFFg5bqyR+DjOqIX6dw3CA+i/oPKYVA4BeOusxux87mGOdY2RV guYkM6lJjQEv4uO287zv3DJ2eqbm+YJz1mp9WztDSD4yvPM6NDjWqi50dtgZ58oBxp/V pq1do5J0bN3sDkq6FqWr6wEZrT5kvKz9LZwnyVOmdgkcIEwJ0tAQSSg2jYI4Z4xMDVyL eG/SbPtkX3a34CCX6tWCis+VQS0PE0qgWPPXk7nd1e8lNd63N++uDH0ovT14lHtl51O8 uo+klN7CvaBKvk5wFsjx7qB4Gv8KppJxEQXdMIqH9aBCbARH7M/93uOZDo3s3AsGmQEz ASsg== X-Gm-Message-State: AKGB3mKaQFmoe5IvdjdZob9FzbB3L56qtXYYZdi/0oq7LPnRca38X5cp GTPIxAwEe0pQszC9gGIeSEPDdg== X-Google-Smtp-Source: ACJfBos+Z6q8pxTEiLPZrfsAt85vGn6PMpVI1E39WHwxEuQh71PjCwJ3XhsIoXbRfFVraF0PpaJ/+Q== X-Received: by 10.98.79.12 with SMTP id d12mr11414019pfb.186.1515637177486; Wed, 10 Jan 2018 18:19:37 -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 f15sm31466752pgv.38.2018.01.10.18.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:19:33 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Luis de Bethencourt , Salah Triki , Linus Torvalds , Alexander Viro , 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 , 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 16/38] befs: Define usercopy region in befs_inode_cache slab cache Date: Wed, 10 Jan 2018 18:02:48 -0800 Message-Id: <1515636190-24061-17-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 From: David Windsor befs symlink pathnames, stored in struct befs_inode_info.i_data.symlink and therefore contained in the befs_inode_cache slab cache, need to be copied to/from userspace. cache object allocation: fs/befs/linuxvfs.c: befs_alloc_inode(...): ... bi = kmem_cache_alloc(befs_inode_cachep, GFP_KERNEL); ... return &bi->vfs_inode; befs_iget(...): ... strlcpy(befs_ino->i_data.symlink, raw_inode->data.symlink, BEFS_SYMLINK_LEN); ... inode->i_link = befs_ino->i_data.symlink; example usage trace: readlink_copy+0x43/0x70 vfs_readlink+0x62/0x110 SyS_readlinkat+0x100/0x130 fs/namei.c: readlink_copy(..., link): ... copy_to_user(..., link, len); (inlined in vfs_readlink) generic_readlink(dentry, ...): struct inode *inode = d_inode(dentry); const char *link = inode->i_link; ... readlink_copy(..., link); In support of usercopy hardening, this patch defines a region in the befs_inode_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 dynamically sized 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, provide usage trace] Cc: Luis de Bethencourt Cc: Salah Triki Signed-off-by: Kees Cook Acked-by: Luis de Bethencourt --- fs/befs/linuxvfs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index ee236231cafa..af2832aaeec5 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -444,11 +444,15 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) static int __init befs_init_inodecache(void) { - befs_inode_cachep = kmem_cache_create("befs_inode_cache", - sizeof (struct befs_inode_info), - 0, (SLAB_RECLAIM_ACCOUNT| - SLAB_MEM_SPREAD|SLAB_ACCOUNT), - init_once); + befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache", + sizeof(struct befs_inode_info), 0, + (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| + SLAB_ACCOUNT), + offsetof(struct befs_inode_info, + i_data.symlink), + sizeof_field(struct befs_inode_info, + i_data.symlink), + init_once); if (befs_inode_cachep == NULL) return -ENOMEM;