From patchwork Wed Sep 20 20:45:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962575 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 6013D60208 for ; Wed, 20 Sep 2017 20:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5240825D9E for ; Wed, 20 Sep 2017 20:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46ED129204; Wed, 20 Sep 2017 20:58:22 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 C7BBC25D9E for ; Wed, 20 Sep 2017 20:58:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbdITU6B (ORCPT ); Wed, 20 Sep 2017 16:58:01 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:45965 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752123AbdITUw4 (ORCPT ); Wed, 20 Sep 2017 16:52:56 -0400 Received: by mail-pg0-f44.google.com with SMTP id 188so2344651pgb.2 for ; Wed, 20 Sep 2017 13:52:56 -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=gaXaGtAzWUjHAYO+dDE3MyF1jugAsF3WlrO9OWF7ql8=; b=AkupWvDsDo9VLBJFDJxdicWc1SHl254vWszXrtfhy8aTcsNsrapTZQDkVEaV00KImy je3p6wQ4Sw3q8iqnZiiFir6bLBIi+wjrLoNwS2ffEFWc1O7FtDO44NdeU3SHOtHSMfki xKsDkp+DrHJX5JlXBuW4MlxM8ws5AKHFVmCzw= 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=gaXaGtAzWUjHAYO+dDE3MyF1jugAsF3WlrO9OWF7ql8=; b=S4gI2lReslC4UPxy7IMbGcYJjKvpngkk/2J6eD/htVegTTUgAJwWT4TARK7iFZAJnb P5YX1UdJg8OcdneHUM0M8nB4i7yogZOxhyGOYetDpM5i4h/+0IaFSqSW1uvOpc/WqPGd +OQkYf1OwqVBrAPTteEfO6fWKAMQ+tA1u5X87CAKq+ocWD5HNGFE/NDVH1BXuu+1tYSv gb7ViNESjpi1VmH6h2C7yV+CQzVfP0ffVYOog0w5KXbIOC5vRSEfNPcX9hM/bRvEK2wq RHBYEqsMO1EpiLmhHyAKtt2IAIoTY/ot+DJIBed+5s88uf2AzSGaBFtRrkY0WL+eWr24 Nu4Q== X-Gm-Message-State: AHPjjUg3qBr2f+xTGfp3MU2HVOI9UfyamO50wVtJknVV/hn1yspWn1Tw zinod2qfaYnPu73SigUn77PV3A== X-Google-Smtp-Source: AOwi7QAOjJ3BLMjLoVi/3ZW4pccAEwZ02oHJI5TWwrTEoEykyF+Wr5UwZjDbWxwULJOSca6J3qB/Dw== X-Received: by 10.84.240.196 with SMTP id l4mr3311980plt.443.1505940775819; Wed, 20 Sep 2017 13:52:55 -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 p88sm10812099pfi.174.2017.09.20.13.52.48 (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 , "Darrick J. Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH v3 15/31] xfs: Define usercopy region in xfs_inode slab cache Date: Wed, 20 Sep 2017 13:45:21 -0700 Message-Id: <1505940337-79069-16-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-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor The XFS inline inode data, stored in struct xfs_inode_t field i_df.if_u2.if_inline_data and therefore contained in the xfs_inode slab cache, needs to be copied to/from userspace. cache object allocation: fs/xfs/xfs_icache.c: xfs_inode_alloc(...): ... ip = kmem_zone_alloc(xfs_inode_zone, KM_SLEEP); fs/xfs/libxfs/xfs_inode_fork.c: xfs_init_local_fork(...): ... if (mem_size <= sizeof(ifp->if_u2.if_inline_data)) ifp->if_u1.if_data = ifp->if_u2.if_inline_data; ... fs/xfs/xfs_symlink.c: xfs_symlink(...): ... xfs_init_local_fork(ip, XFS_DATA_FORK, target_path, pathlen); example usage trace: readlink_copy+0x43/0x70 vfs_readlink+0x62/0x110 SyS_readlinkat+0x100/0x130 fs/xfs/xfs_iops.c: (via inode->i_op->get_link) xfs_vn_get_link_inline(...): ... return XFS_I(inode)->i_df.if_u1.if_data; fs/namei.c: readlink_copy(..., link): ... copy_to_user(..., link, len); generic_readlink(dentry, ...): struct inode *inode = d_inode(dentry); const char *link = inode->i_link; ... if (!link) { link = inode->i_op->get_link(dentry, inode, &done); ... readlink_copy(..., link); In support of usercopy hardening, this patch defines a region in the xfs_inode 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 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: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Darrick J. Wong --- fs/xfs/kmem.h | 10 ++++++++++ fs/xfs/xfs_super.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index 4d85992d75b2..08358f38dee6 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -110,6 +110,16 @@ kmem_zone_init_flags(int size, char *zone_name, unsigned long flags, return kmem_cache_create(zone_name, size, 0, flags, construct); } +static inline kmem_zone_t * +kmem_zone_init_flags_usercopy(int size, char *zone_name, unsigned long flags, + size_t useroffset, size_t usersize, + void (*construct)(void *)) +{ + return kmem_cache_create_usercopy(zone_name, size, 0, flags, + useroffset, usersize, construct); +} + + static inline void kmem_zone_free(kmem_zone_t *zone, void *ptr) { diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index c996f4ae4a5f..1b4b67194538 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1846,9 +1846,12 @@ xfs_init_zones(void) goto out_destroy_efd_zone; xfs_inode_zone = - kmem_zone_init_flags(sizeof(xfs_inode_t), "xfs_inode", + kmem_zone_init_flags_usercopy(sizeof(xfs_inode_t), "xfs_inode", KM_ZONE_HWALIGN | KM_ZONE_RECLAIM | KM_ZONE_SPREAD | - KM_ZONE_ACCOUNT, xfs_fs_inode_init_once); + KM_ZONE_ACCOUNT, + offsetof(xfs_inode_t, i_df.if_u2.if_inline_data), + sizeof_field(xfs_inode_t, i_df.if_u2.if_inline_data), + xfs_fs_inode_init_once); if (!xfs_inode_zone) goto out_destroy_efi_zone;