{"id":816486,"url":"http://patchwork.ozlabs.org/api/patches/816486/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-14-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505940337-79069-14-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:19","name":"[v3,13/31] ufs: Define usercopy region in ufs_inode_cache slab cache","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"1f86eaf54aa2cc80c24c8344d8794a8d71357453","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-14-git-send-email-keescook@chromium.org/mbox/","series":[{"id":4231,"url":"http://patchwork.ozlabs.org/api/series/4231/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4231","date":"2017-09-20T20:45:22","name":"Hardened usercopy whitelisting","version":3,"mbox":"http://patchwork.ozlabs.org/series/4231/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816486/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816486/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"cobMLXMv\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBfV74lzz9s83\n\tfor ;\n\tThu, 21 Sep 2017 06:48:34 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751912AbdITUsG (ORCPT );\n\tWed, 20 Sep 2017 16:48:06 -0400","from mail-pg0-f45.google.com ([74.125.83.45]:56194 \"EHLO\n\tmail-pg0-f45.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751908AbdITUqL (ORCPT\n\t); Wed, 20 Sep 2017 16:46:11 -0400","by mail-pg0-f45.google.com with SMTP id b11so2320481pgn.12\n\tfor ; Wed, 20 Sep 2017 13:46:11 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tt125sm9434148pgc.50.2017.09.20.13.46.01\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:46:08 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=bCuCLTk9+B6AXPP7kZ6H/admCUVFFk7+hdquAwXQrjE=;\n\tb=cobMLXMvlwTawb1WQd8DWiFLXJm10e9ZNRxneSs37XtyFkRvz1fKcheVgkhhM0wwvz\n\trxUuMaWWzZrg7KfyDTrm4SymU0XAqDAY4Qw08zelrwLU4Z/H8rV3/8/6BtggaMU++kOM\n\tsNzEPRI2BnnBsaUb7o5I9749Iwa2YCiNjHQ8o=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=bCuCLTk9+B6AXPP7kZ6H/admCUVFFk7+hdquAwXQrjE=;\n\tb=XNRRGYwSlOZ4YAp5kp4/nzZZqBZMRtqjeTEP10z1523Wee5VL1gY65fWgIyJyOJRGj\n\tb8oyc6+DaB3fzdAoJcu6LnARrDDrURjZTeBGDQ1BQ8BaFwo7277YkSObsBhFGzVYPhW/\n\t+yDcFy9XKb4Qb4UKTGZAP5NlTydU72maFZKRXksiqjCYDBiWvznvdPKB3chW+PUPY6pg\n\tCTc9K3QRy48uyqpOD9QaX1r7XBgIvjXuivaqjsmDqsjRJ8RgkO+j+9t4urf/k0hRa5qM\n\tMK3McN04KzAse5aFYnzPUoj56yV9QVzD+1PaN2zqv+ia6zEDclZkaqq8rw35BF4RLEd0\n\tqfIA==","X-Gm-Message-State":"AHPjjUghuWcF49ALqrcqnzosl9bb1nm6JL4NoVF1hWXDWAWiirJeHVSa\n\t6m7mTHc2hOn1uNe/ryAzvr8tjQ==","X-Google-Smtp-Source":"AOwi7QC22hNjPKOL8hqCejxE5rba+Uf+JnhG2CycDnRbB80ZrYZEcSGwQnISJLLI4IHFIfD8fELKPw==","X-Received":"by 10.99.121.141 with SMTP id u135mr3428496pgc.262.1505940371362;\n\tWed, 20 Sep 2017 13:46:11 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\tEvgeniy Dushistov ,\n\tlinux-fsdevel@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-mm@kvack.org, kernel-hardening@lists.openwall.com","Subject":"[PATCH v3 13/31] ufs: Define usercopy region in ufs_inode_cache\n\tslab 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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: David Windsor \n\nThe ufs symlink pathnames, stored in struct ufs_inode_info.i_u1.i_symlink\nand therefore contained in the ufs_inode_cache slab cache, need to be\ncopied to/from userspace.\n\ncache object allocation:\n fs/ufs/super.c:\n ufs_alloc_inode(...):\n ...\n ei = kmem_cache_alloc(ufs_inode_cachep, GFP_NOFS);\n ...\n return &ei->vfs_inode;\n\n fs/ufs/ufs.h:\n UFS_I(struct inode *inode):\n return container_of(inode, struct ufs_inode_info, vfs_inode);\n\n fs/ufs/namei.c:\n ufs_symlink(...):\n ...\n inode->i_link = (char *)UFS_I(inode)->i_u1.i_symlink;\n\nexample usage trace:\n readlink_copy+0x43/0x70\n vfs_readlink+0x62/0x110\n SyS_readlinkat+0x100/0x130\n\n fs/namei.c:\n readlink_copy(..., link):\n ...\n copy_to_user(..., link, len);\n\n (inlined in vfs_readlink)\n generic_readlink(dentry, ...):\n struct inode *inode = d_inode(dentry);\n const char *link = inode->i_link;\n ...\n readlink_copy(..., link);\n\nIn support of usercopy hardening, this patch defines a region in the\nufs_inode_cache slab cache in which userspace copy operations are allowed.\n\nThis region is known as the slab cache's usercopy region. Slab caches can\nnow check that each copy operation involving cache-managed memory falls\nentirely within the slab's usercopy region.\n\nThis patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY\nwhitelisting code in the last public patch of grsecurity/PaX based on my\nunderstanding of the code. Changes or omissions from the original code are\nmine and don't reflect the original grsecurity/PaX code.\n\nSigned-off-by: David Windsor \n[kees: adjust commit log, provide usage trace]\nCc: Evgeniy Dushistov \nSigned-off-by: Kees Cook \n---\n fs/ufs/super.c | 13 ++++++++-----\n 1 file changed, 8 insertions(+), 5 deletions(-)","diff":"diff --git a/fs/ufs/super.c b/fs/ufs/super.c\nindex 6440003f8ddc..62b6a4aad809 100644\n--- a/fs/ufs/super.c\n+++ b/fs/ufs/super.c\n@@ -1466,11 +1466,14 @@ static void init_once(void *foo)\n \n static int __init init_inodecache(void)\n {\n-\tufs_inode_cachep = kmem_cache_create(\"ufs_inode_cache\",\n-\t\t\t\t\t sizeof(struct ufs_inode_info),\n-\t\t\t\t\t 0, (SLAB_RECLAIM_ACCOUNT|\n-\t\t\t\t\t\tSLAB_MEM_SPREAD|SLAB_ACCOUNT),\n-\t\t\t\t\t init_once);\n+\tufs_inode_cachep = kmem_cache_create_usercopy(\"ufs_inode_cache\",\n+\t\t\t\tsizeof(struct ufs_inode_info), 0,\n+\t\t\t\t(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|\n+\t\t\t\t\tSLAB_ACCOUNT),\n+\t\t\t\toffsetof(struct ufs_inode_info, i_u1.i_symlink),\n+\t\t\t\tsizeof_field(struct ufs_inode_info,\n+\t\t\t\t\ti_u1.i_symlink),\n+\t\t\t\tinit_once);\n \tif (ufs_inode_cachep == NULL)\n \t\treturn -ENOMEM;\n \treturn 0;\n","prefixes":["v3","13/31"]}