From patchwork Wed Sep 20 22:45:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9962817 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 09DA560208 for ; Wed, 20 Sep 2017 22:48:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFD2828925 for ; Wed, 20 Sep 2017 22:48:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E2E290DB; Wed, 20 Sep 2017 22:48:50 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 9CDB828925 for ; Wed, 20 Sep 2017 22:48:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751853AbdITWrJ (ORCPT ); Wed, 20 Sep 2017 18:47:09 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34728 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751795AbdITWrG (ORCPT ); Wed, 20 Sep 2017 18:47:06 -0400 Received: by mail-pg0-f65.google.com with SMTP id u18so2378938pgo.1; Wed, 20 Sep 2017 15:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=; b=i0GLmEHHUqOLF8/hYgw1I9Lx1Xa6pZ3BJ9xw76nCuU3Wi3J+9HZpXlHE1Cgnhn/GTh 1SJ/MyrGdkN6g8Jj8G1drhk1Da/QU5kX1AwPHiVLUIwezn0sUZhWkAlUTnrTFtkrbsax EsEbGjycZr9tkTVnT/P0/fvCi8XHyRzaZgD4/KgLXlJPab7LTSdQiUhdBeB4mul+ZVh7 MXDe2mowsVbdSViijhHggwHgyyZN89bJ3rPZFbVoOP4oboPnojjORJRXRSdKyOhaNk3/ 2alsw4H3nZa9Etp+VG3ZUMM+HBQPQ37OodMnRwcwIcoaN5OQeG6uhImia8FiXrNY9eEa 5Ilg== 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=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=; b=PoWVe+rdF/U8hb8HsiNOoYzGxpG26HODZueJKB3FvHHv6spQYYxiqNC3vheqtC2E+j miL/5TwE1vhqtclQWMU5wXAWaSgCf9PwYh+NLdgB0Qb95TfSoCWGgUa8SqvmInNZnYUT KidjWEujsrLimB+Qo1bwSKyNJDsMh6sYVztpNd+sv1LMyNthmFlos0zeJYiwYBjsC2cN zQcSppbmmtNGJYEBdOt4Iqd1QQHNyRy9DARKVQOpAKYICU5PGKIvZ+MCWtPO3rYt8TP+ S/qWkTGnIxam5LcCvC/ZX1baUQRs/kEmnShT6AUc9WnEtKStfaFmgNB4F4jPkjwVKDAr +UHg== X-Gm-Message-State: AHPjjUjZGm+cloShyWZmNCEDmRaW+FSvi5fYQeWLG3Az9NUoSY540/VG rvquC52z70BikquFJ8Fee9e7emKURgs= X-Google-Smtp-Source: AOwi7QBP6a6x8P7lbYDp/n2H5C8yfjymALkj4exutY4HP6wfeN1bSxg3GvqR2viIi+V6/h4RrOr80Q== X-Received: by 10.99.4.7 with SMTP id 7mr3538064pge.400.1505947625571; Wed, 20 Sep 2017 15:47:05 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id j2sm6249pgn.26.2017.09.20.15.47.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 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, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, "Theodore Y . Ts'o" , Jaegeuk Kim , Michael Halcrow , Eric 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-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Signed-off-by: Eric Biggers --- fs/ext4/namei.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index b2058500f1dc..b2fbc2b87bcf 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3516,12 +3516,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, EXT4_I(old_dentry->d_inode)->i_projid))) return -EXDEV; - if ((ext4_encrypted_inode(old_dir) && - !fscrypt_has_encryption_key(old_dir)) || - (ext4_encrypted_inode(new_dir) && - !fscrypt_has_encryption_key(new_dir))) - return -ENOKEY; - retval = dquot_initialize(old.dir); if (retval) return retval; @@ -3550,13 +3544,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, if (!old.bh || le32_to_cpu(old.de->inode) != old.inode->i_ino) goto end_rename; - if ((old.dir != new.dir) && - ext4_encrypted_inode(new.dir) && - !fscrypt_has_permitted_context(new.dir, old.inode)) { - retval = -EPERM; - goto end_rename; - } - new.bh = ext4_find_entry(new.dir, &new.dentry->d_name, &new.de, &new.inlined); if (IS_ERR(new.bh)) { @@ -3722,19 +3709,6 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, int retval; struct timespec ctime; - if ((ext4_encrypted_inode(old_dir) && - !fscrypt_has_encryption_key(old_dir)) || - (ext4_encrypted_inode(new_dir) && - !fscrypt_has_encryption_key(new_dir))) - return -ENOKEY; - - if ((ext4_encrypted_inode(old_dir) || - ext4_encrypted_inode(new_dir)) && - (old_dir != new_dir) && - (!fscrypt_has_permitted_context(new_dir, old.inode) || - !fscrypt_has_permitted_context(old_dir, new.inode))) - return -EPERM; - if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) && !projid_eq(EXT4_I(new_dir)->i_projid, EXT4_I(old_dentry->d_inode)->i_projid)) || @@ -3861,12 +3835,19 @@ static int ext4_rename2(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) { + int err; + if (unlikely(ext4_forced_shutdown(EXT4_SB(old_dir->i_sb)))) return -EIO; if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) return -EINVAL; + err = fscrypt_prepare_rename(old_dir, old_dentry, new_dir, new_dentry, + flags); + if (err) + return err; + if (flags & RENAME_EXCHANGE) { return ext4_cross_rename(old_dir, old_dentry, new_dir, new_dentry);