Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f11498c8 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

ext4: switch to fscrypt_prepare_rename() 



Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 14ddd82f

fs/ext4/namei.c

+7 −26
Original line number Diff line number Diff line
@@ -3437,12 +3437,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;
@@ -3471,13 +3465,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)) {
@@ -3642,19 +3629,6 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	u8 new_file_type;

	int retval;



	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)) ||
@@ -3780,9 +3754,16 @@ 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 (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);