{"id":816558,"url":"http://patchwork.ozlabs.org/api/patches/816558/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-14-ebiggers3@gmail.com/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/projects/8/?format=json","name":"Linux ext4 filesystem development","link_name":"linux-ext4","list_id":"linux-ext4.vger.kernel.org","list_email":"linux-ext4@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920224605.22030-14-ebiggers3@gmail.com>","list_archive_url":null,"date":"2017-09-20T22:45:53","name":"[13/25] ext4: switch to fscrypt_prepare_rename()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"5991de039eb509f8f05b76ee4346ad70d8016cc6","submitter":{"id":65202,"url":"http://patchwork.ozlabs.org/api/people/65202/?format=json","name":"Eric Biggers","email":"ebiggers3@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170920224605.22030-14-ebiggers3@gmail.com/mbox/","series":[{"id":4249,"url":"http://patchwork.ozlabs.org/api/series/4249/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=4249","date":"2017-09-20T22:45:40","name":"fscrypt: add some higher-level helper functions","version":1,"mbox":"http://patchwork.ozlabs.org/series/4249/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816558/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816558/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=linux-ext4-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"i0GLmEHH\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyFJm4X3zz9sNr\n\tfor ;\n\tThu, 21 Sep 2017 08:48:24 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751970AbdITWrJ (ORCPT );\n\tWed, 20 Sep 2017 18:47:09 -0400","from mail-pg0-f65.google.com ([74.125.83.65]:34728 \"EHLO\n\tmail-pg0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751795AbdITWrG (ORCPT\n\t); Wed, 20 Sep 2017 18:47:06 -0400","by mail-pg0-f65.google.com with SMTP id u18so2378938pgo.1;\n\tWed, 20 Sep 2017 15:47:06 -0700 (PDT)","from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81])\n\tby smtp.gmail.com with ESMTPSA id j2sm6249pgn.26.2017.09.20.15.47.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 20 Sep 2017 15:47:05 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=;\n\tb=i0GLmEHHUqOLF8/hYgw1I9Lx1Xa6pZ3BJ9xw76nCuU3Wi3J+9HZpXlHE1Cgnhn/GTh\n\t1SJ/MyrGdkN6g8Jj8G1drhk1Da/QU5kX1AwPHiVLUIwezn0sUZhWkAlUTnrTFtkrbsax\n\tEsEbGjycZr9tkTVnT/P0/fvCi8XHyRzaZgD4/KgLXlJPab7LTSdQiUhdBeB4mul+ZVh7\n\tMXDe2mowsVbdSViijhHggwHgyyZN89bJ3rPZFbVoOP4oboPnojjORJRXRSdKyOhaNk3/\n\t2alsw4H3nZa9Etp+VG3ZUMM+HBQPQ37OodMnRwcwIcoaN5OQeG6uhImia8FiXrNY9eEa\n\t5Ilg==","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=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=;\n\tb=PoWVe+rdF/U8hb8HsiNOoYzGxpG26HODZueJKB3FvHHv6spQYYxiqNC3vheqtC2E+j\n\tmiL/5TwE1vhqtclQWMU5wXAWaSgCf9PwYh+NLdgB0Qb95TfSoCWGgUa8SqvmInNZnYUT\n\tKidjWEujsrLimB+Qo1bwSKyNJDsMh6sYVztpNd+sv1LMyNthmFlos0zeJYiwYBjsC2cN\n\tzQcSppbmmtNGJYEBdOt4Iqd1QQHNyRy9DARKVQOpAKYICU5PGKIvZ+MCWtPO3rYt8TP+\n\tS/qWkTGnIxam5LcCvC/ZX1baUQRs/kEmnShT6AUc9WnEtKStfaFmgNB4F4jPkjwVKDAr\n\t+UHg==","X-Gm-Message-State":"AHPjjUjZGm+cloShyWZmNCEDmRaW+FSvi5fYQeWLG3Az9NUoSY540/VG\n\trvquC52z70BikquFJ8Fee9e7emKURgs=","X-Google-Smtp-Source":"AOwi7QBP6a6x8P7lbYDp/n2H5C8yfjymALkj4exutY4HP6wfeN1bSxg3GvqR2viIi+V6/h4RrOr80Q==","X-Received":"by 10.99.4.7 with SMTP id 7mr3538064pge.400.1505947625571;\n\tWed, 20 Sep 2017 15:47:05 -0700 (PDT)","From":"Eric Biggers ","To":"linux-fscrypt@vger.kernel.org","Cc":"linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,\n\tlinux-f2fs-devel@lists.sourceforge.net,\n\tlinux-mtd@lists.infradead.org, \"Theodore Y . Ts'o\" ,\n\tJaegeuk Kim , Michael Halcrow ,\n\tEric Biggers ","Subject":"[PATCH 13/25] ext4: switch to fscrypt_prepare_rename()","Date":"Wed, 20 Sep 2017 15:45:53 -0700","Message-Id":"<20170920224605.22030-14-ebiggers3@gmail.com>","X-Mailer":"git-send-email 2.14.1.821.g8fa685d3b7-goog","In-Reply-To":"<20170920224605.22030-1-ebiggers3@gmail.com>","References":"<20170920224605.22030-1-ebiggers3@gmail.com>","Sender":"linux-ext4-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"From: Eric Biggers \n\nSigned-off-by: Eric Biggers \n---\n fs/ext4/namei.c | 33 +++++++--------------------------\n 1 file changed, 7 insertions(+), 26 deletions(-)","diff":"diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c\nindex b2058500f1dc..b2fbc2b87bcf 100644\n--- a/fs/ext4/namei.c\n+++ b/fs/ext4/namei.c\n@@ -3516,12 +3516,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,\n \t\t\tEXT4_I(old_dentry->d_inode)->i_projid)))\n \t\treturn -EXDEV;\n \n-\tif ((ext4_encrypted_inode(old_dir) &&\n-\t !fscrypt_has_encryption_key(old_dir)) ||\n-\t (ext4_encrypted_inode(new_dir) &&\n-\t !fscrypt_has_encryption_key(new_dir)))\n-\t\treturn -ENOKEY;\n-\n \tretval = dquot_initialize(old.dir);\n \tif (retval)\n \t\treturn retval;\n@@ -3550,13 +3544,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,\n \tif (!old.bh || le32_to_cpu(old.de->inode) != old.inode->i_ino)\n \t\tgoto end_rename;\n \n-\tif ((old.dir != new.dir) &&\n-\t ext4_encrypted_inode(new.dir) &&\n-\t !fscrypt_has_permitted_context(new.dir, old.inode)) {\n-\t\tretval = -EPERM;\n-\t\tgoto end_rename;\n-\t}\n-\n \tnew.bh = ext4_find_entry(new.dir, &new.dentry->d_name,\n \t\t\t\t &new.de, &new.inlined);\n \tif (IS_ERR(new.bh)) {\n@@ -3722,19 +3709,6 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,\n \tint retval;\n \tstruct timespec ctime;\n \n-\tif ((ext4_encrypted_inode(old_dir) &&\n-\t !fscrypt_has_encryption_key(old_dir)) ||\n-\t (ext4_encrypted_inode(new_dir) &&\n-\t !fscrypt_has_encryption_key(new_dir)))\n-\t\treturn -ENOKEY;\n-\n-\tif ((ext4_encrypted_inode(old_dir) ||\n-\t ext4_encrypted_inode(new_dir)) &&\n-\t (old_dir != new_dir) &&\n-\t (!fscrypt_has_permitted_context(new_dir, old.inode) ||\n-\t !fscrypt_has_permitted_context(old_dir, new.inode)))\n-\t\treturn -EPERM;\n-\n \tif ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) &&\n \t !projid_eq(EXT4_I(new_dir)->i_projid,\n \t\t\tEXT4_I(old_dentry->d_inode)->i_projid)) ||\n@@ -3861,12 +3835,19 @@ static int ext4_rename2(struct inode *old_dir, struct dentry *old_dentry,\n \t\t\tstruct inode *new_dir, struct dentry *new_dentry,\n \t\t\tunsigned int flags)\n {\n+\tint err;\n+\n \tif (unlikely(ext4_forced_shutdown(EXT4_SB(old_dir->i_sb))))\n \t\treturn -EIO;\n \n \tif (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))\n \t\treturn -EINVAL;\n \n+\terr = fscrypt_prepare_rename(old_dir, old_dentry, new_dir, new_dentry,\n+\t\t\t\t flags);\n+\tif (err)\n+\t\treturn err;\n+\n \tif (flags & RENAME_EXCHANGE) {\n \t\treturn ext4_cross_rename(old_dir, old_dentry,\n \t\t\t\t\t new_dir, new_dentry);\n","prefixes":["13/25"]}