From patchwork Tue Jan 9 20:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153511 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 CA36960223 for ; Tue, 9 Jan 2018 21:14:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C04492097A for ; Tue, 9 Jan 2018 21:14:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B300E22380; Tue, 9 Jan 2018 21:14:30 +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=ham 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 1DB3F2097A for ; Tue, 9 Jan 2018 21:14:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751605AbeAIVOZ (ORCPT ); Tue, 9 Jan 2018 16:14:25 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:46204 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758242AbeAIU5E (ORCPT ); Tue, 9 Jan 2018 15:57:04 -0500 Received: by mail-pf0-f196.google.com with SMTP id y5so5531458pff.13 for ; Tue, 09 Jan 2018 12:57:04 -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=cHB2F/Yz6P6r9aNJ3lpILjggOeGYjgFQ1X/Tj7q44/0=; b=KpqIQCRXHVquMJMFv0iMHJq9BODX5KftZKEqPt9cZlslZkPG3qEjA/jGVc7jWp2dTH 8mScbV4sozrMrnW7amBWeAwyIt4b+cUXC8IxtbgrZ+/lIY3jMPfsNpDrA+CRpTkNRWEM zE0iSNvYpO+R8PR1LNAq6dKxkou5Ig9AByzOU= 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=cHB2F/Yz6P6r9aNJ3lpILjggOeGYjgFQ1X/Tj7q44/0=; b=A7B1xJ3IVuJqaXz3kTDThioMGx7VxDPg16Rlwp7t8mMQ3cbhfg7ZiTnKgBh1AybyvC akUUKRjsKyUKvYA5bnvhQpfwZGkGEHvci/4XXJfj1IVeFJLKCrJBzrLVDnrDRwaoHqoW zRjJacdoJefh7HZzJtrblXT8EqKX2m4wLeWsPWU12gnxFdtJQ8xBL0XLhuCkkQrWDHfT 6SCYNHSU5s2Bg9V8cnSqj/lB00F8ZI0/AWmPx6w/P97ogjuQZzWaoGiNBqC5JBRm1YBP E/D4O4C75qjX8ofuMzMkqrVxEqqG2RgrqFzl7PGhmdPOvM9mXsKgCLSVGiSsBFzh0ZIH 1XPA== X-Gm-Message-State: AKGB3mIyV35e7FzkSGJOxNTn6urBM+a2UK/+0C9IRcIA0LVnqEVpGIgE zRJyI4ckf2hFND85LGXDow2d1Q== X-Google-Smtp-Source: ACJfBouUuBDAR4AYDoF3NJyToqojrfA230tk8g2xZaZT1Pnq3YSVdcaCy1I3OZI6T7YGXi1gGGsYMA== X-Received: by 10.159.247.138 with SMTP id e10mr12329648pls.279.1515531423676; Tue, 09 Jan 2018 12:57:03 -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 u19sm28962213pfh.89.2018.01.09.12.57.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 12:57:02 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Mike Marshall , 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/36] orangefs: Define usercopy region in orangefs_inode_cache slab cache Date: Tue, 9 Jan 2018 12:55:44 -0800 Message-Id: <1515531365-37423-16-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 orangefs symlink pathnames, stored in struct orangefs_inode_s.link_target and therefore contained in the orangefs_inode_cache, need to be copied to/from userspace. cache object allocation: fs/orangefs/super.c: orangefs_alloc_inode(...): ... orangefs_inode = kmem_cache_alloc(orangefs_inode_cache, ...); ... return &orangefs_inode->vfs_inode; fs/orangefs/orangefs-utils.c: exofs_symlink(...): ... inode->i_link = orangefs_inode->link_target; 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 orangefs_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: Mike Marshall Signed-off-by: Kees Cook --- fs/orangefs/super.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 36f1390b5ed7..62d49e53061c 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -610,11 +610,16 @@ void orangefs_kill_sb(struct super_block *sb) int orangefs_inode_cache_initialize(void) { - orangefs_inode_cache = kmem_cache_create("orangefs_inode_cache", - sizeof(struct orangefs_inode_s), - 0, - ORANGEFS_CACHE_CREATE_FLAGS, - orangefs_inode_cache_ctor); + orangefs_inode_cache = kmem_cache_create_usercopy( + "orangefs_inode_cache", + sizeof(struct orangefs_inode_s), + 0, + ORANGEFS_CACHE_CREATE_FLAGS, + offsetof(struct orangefs_inode_s, + link_target), + sizeof_field(struct orangefs_inode_s, + link_target), + orangefs_inode_cache_ctor); if (!orangefs_inode_cache) { gossip_err("Cannot create orangefs_inode_cache\n");