From patchwork Wed Sep 20 20:45:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962439 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 60E3960208 for ; Wed, 20 Sep 2017 20:48:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5394529226 for ; Wed, 20 Sep 2017 20:48:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48ACC29229; Wed, 20 Sep 2017 20:48:08 +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 D3F7E29226 for ; Wed, 20 Sep 2017 20:48:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751578AbdITUsF (ORCPT ); Wed, 20 Sep 2017 16:48:05 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:46923 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751909AbdITUqL (ORCPT ); Wed, 20 Sep 2017 16:46:11 -0400 Received: by mail-pg0-f51.google.com with SMTP id i130so2336722pgc.3 for ; Wed, 20 Sep 2017 13:46:11 -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=bCuCLTk9+B6AXPP7kZ6H/admCUVFFk7+hdquAwXQrjE=; b=cobMLXMvlwTawb1WQd8DWiFLXJm10e9ZNRxneSs37XtyFkRvz1fKcheVgkhhM0wwvz rxUuMaWWzZrg7KfyDTrm4SymU0XAqDAY4Qw08zelrwLU4Z/H8rV3/8/6BtggaMU++kOM sNzEPRI2BnnBsaUb7o5I9749Iwa2YCiNjHQ8o= 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=bCuCLTk9+B6AXPP7kZ6H/admCUVFFk7+hdquAwXQrjE=; b=rZsP+xoomZw8axsLP8XwWMpmcIzdohceei+Wa3gT5zADOxf/9kaRtGQdLz3ADjLKIw COphm0RqDb20BBYJPWyxvlI+thzctl7L4Lhv2El6xMapEB1Li3JivPk4z1ykM3C+nraM bGXcVBFhjzSQL3a9NDzT9uWxIwtfwV4DAiF0FOZp1GC5YkqwtsjlfuysJXZrZ0l7AwV7 JjafoJoVPdi50at7bgbJYz6TIBTss05EOx6OIaA566I+CMbSH9mMvSHoEUvCzwxuRYiN m4BmfI7sRcbTwqSnMvbZphF7IIEafdySz09WxuuTI/PnWJUXRi06ZTi+X4lYrtZY+39v LQcw== X-Gm-Message-State: AHPjjUj8jTHikgJRnQ9dW51RL7LO3FnHJqdbhw3P5Rrd/Kos88RJt61r 5W7cjWPEFythoT3yDnlZjioIIQ== X-Google-Smtp-Source: AOwi7QC22hNjPKOL8hqCejxE5rba+Uf+JnhG2CycDnRbB80ZrYZEcSGwQnISJLLI4IHFIfD8fELKPw== X-Received: by 10.99.121.141 with SMTP id u135mr3428496pgc.262.1505940371362; Wed, 20 Sep 2017 13:46:11 -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 t125sm9434148pgc.50.2017.09.20.13.46.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:46:08 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Evgeniy Dushistov , linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH v3 13/31] ufs: Define usercopy region in ufs_inode_cache slab cache Date: Wed, 20 Sep 2017 13:45:19 -0700 Message-Id: <1505940337-79069-14-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-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 ufs symlink pathnames, stored in struct ufs_inode_info.i_u1.i_symlink and therefore contained in the ufs_inode_cache slab cache, need to be copied to/from userspace. cache object allocation: fs/ufs/super.c: ufs_alloc_inode(...): ... ei = kmem_cache_alloc(ufs_inode_cachep, GFP_NOFS); ... return &ei->vfs_inode; fs/ufs/ufs.h: UFS_I(struct inode *inode): return container_of(inode, struct ufs_inode_info, vfs_inode); fs/ufs/namei.c: ufs_symlink(...): ... inode->i_link = (char *)UFS_I(inode)->i_u1.i_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 ufs_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 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: Evgeniy Dushistov Signed-off-by: Kees Cook --- fs/ufs/super.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 6440003f8ddc..62b6a4aad809 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -1466,11 +1466,14 @@ static void init_once(void *foo) static int __init init_inodecache(void) { - ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", - sizeof(struct ufs_inode_info), - 0, (SLAB_RECLAIM_ACCOUNT| - SLAB_MEM_SPREAD|SLAB_ACCOUNT), - init_once); + ufs_inode_cachep = kmem_cache_create_usercopy("ufs_inode_cache", + sizeof(struct ufs_inode_info), 0, + (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| + SLAB_ACCOUNT), + offsetof(struct ufs_inode_info, i_u1.i_symlink), + sizeof_field(struct ufs_inode_info, + i_u1.i_symlink), + init_once); if (ufs_inode_cachep == NULL) return -ENOMEM; return 0;