From patchwork Thu Jan 11 02:02:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156489 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 4CA9E605BA for ; Thu, 11 Jan 2018 02:06:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C88A28526 for ; Thu, 11 Jan 2018 02:06:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EB85286F4; Thu, 11 Jan 2018 02:06:01 +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 80B0B28526 for ; Thu, 11 Jan 2018 02:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753568AbeAKCEV (ORCPT ); Wed, 10 Jan 2018 21:04:21 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:43783 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753876AbeAKCDh (ORCPT ); Wed, 10 Jan 2018 21:03:37 -0500 Received: by mail-pg0-f68.google.com with SMTP id f14so1584486pga.10 for ; Wed, 10 Jan 2018 18:03: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=N+1YJFvHTPQOoWtwEI/exfP7oTpaenyjsc66TPEbm20=; b=kiBefoTT8t3qM6vdFFK2Tc8DgtTZngbYl1PRYrfc85uQ1CV2Y8egh+13zeJDybUrcH 0xSlqrPiGO0HgvH4unRMD8lJWFgjMHGi1sWAuBwRdWF798QToyIB5mGdS01s4IE0cD6j PCsdewONvMkoKKIkHbrsFLKIk1USQwfz01J0k= 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=N+1YJFvHTPQOoWtwEI/exfP7oTpaenyjsc66TPEbm20=; b=DYZ8Aapu0o7ct0R22q/4oFKlpir6f2Gm/A6ctEFx01oF3jWpw6ztOG/RyPC1ChzhL/ 0p5qefalbpU4J/LWfJfavgLFT8i3lkzZkiRbbJgFbBY5qTVQzlDW0OPNW0dvChsFPpGl 4BMskSIrGxjII0AC0jVwGw/oVLgTrX7kID9s2WtFBrJ+3TwcvpxOv5KRSg+RwxhECUCC lGaUWVj8sJYi/0Naoo4S8iD9GmdrElbFGueMucffCljGRJGXftlBZkT/Yk032ydWNbh9 KNhTk9LStGbVqmr/W7XLSTJHHj2jiRrjJ+bbxkuEBH9N3jcRahbmOb9TmqG8d4/uYIju yzRw== X-Gm-Message-State: AKGB3mKmpe56pLJRKQ+eJoY9JDjxyZQ3ZisSWzSmZKdo1X6mfGNlo6gN adBWNuEHSB4vP8+JMB/XRffxGg== X-Google-Smtp-Source: ACJfBovws6UraliYDbuC/sAmr3bojYhs9EIoOm4Y6ejanomXIEJkUygcYR5GIZ89Kq+vJpVWoi5G3Q== X-Received: by 10.84.132.97 with SMTP id 88mr20652917ple.57.1515636217356; Wed, 10 Jan 2018 18:03: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 67sm32190306pgg.50.2018.01.10.18.03.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:03:32 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Dave Kleikamp , jfs-discussion@lists.sourceforge.net, 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 , Luis de Bethencourt , 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 15/38] jfs: Define usercopy region in jfs_ip slab cache Date: Wed, 10 Jan 2018 18:02:47 -0800 Message-Id: <1515636190-24061-16-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 The jfs symlink pathnames, stored in struct jfs_inode_info.i_inline and therefore contained in the jfs_ip slab cache, need to be copied to/from userspace. cache object allocation: fs/jfs/super.c: jfs_alloc_inode(...): ... jfs_inode = kmem_cache_alloc(jfs_inode_cachep, GFP_NOFS); ... return &jfs_inode->vfs_inode; fs/jfs/jfs_incore.h: JFS_IP(struct inode *inode): return container_of(inode, struct jfs_inode_info, vfs_inode); fs/jfs/inode.c: jfs_iget(...): ... inode->i_link = JFS_IP(inode)->i_inline; 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 jfs_ip 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: Dave Kleikamp Cc: jfs-discussion@lists.sourceforge.net Signed-off-by: Kees Cook Acked-by: Dave Kleikamp --- fs/jfs/super.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 90373aebfdca..1b9264fd54b6 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -965,9 +965,11 @@ static int __init init_jfs_fs(void) int rc; jfs_inode_cachep = - kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_ACCOUNT, - init_once); + kmem_cache_create_usercopy("jfs_ip", sizeof(struct jfs_inode_info), + 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_ACCOUNT, + offsetof(struct jfs_inode_info, i_inline), + sizeof_field(struct jfs_inode_info, i_inline), + init_once); if (jfs_inode_cachep == NULL) return -ENOMEM;