Commit 94b26f36 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

fscrypt: new helper function - fscrypt_prepare_rename() 



Introduce a helper function which prepares to rename a file into a
possibly encrypted directory.  It handles loading the encryption keys
for the source and target directories if needed, and it handles
enforcing that if the target directory (and the source directory for a
cross-rename) is encrypted, then the file being moved into the directory
has the same encryption policy as its containing directory.

Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 0ea87a96

fs/crypto/hooks.c

+30 −0
Original line number Diff line number Diff line
@@ -62,3 +62,33 @@ int __fscrypt_prepare_link(struct inode *inode, struct inode *dir) 
	return 0;

}

EXPORT_SYMBOL_GPL(__fscrypt_prepare_link);



int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry,

			     struct inode *new_dir, struct dentry *new_dentry,

			     unsigned int flags)

{

	int err;



	err = fscrypt_require_key(old_dir);

	if (err)

		return err;



	err = fscrypt_require_key(new_dir);

	if (err)

		return err;



	if (old_dir != new_dir) {

		if (IS_ENCRYPTED(new_dir) &&

		    !fscrypt_has_permitted_context(new_dir,

						   d_inode(old_dentry)))

			return -EPERM;



		if ((flags & RENAME_EXCHANGE) &&

		    IS_ENCRYPTED(old_dir) &&

		    !fscrypt_has_permitted_context(old_dir,

						   d_inode(new_dentry)))

			return -EPERM;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(__fscrypt_prepare_rename);

include/linux/fscrypt.h

+33 −0
Original line number Diff line number Diff line
@@ -204,4 +204,37 @@ static inline int fscrypt_prepare_link(struct dentry *old_dentry, 
	return 0;

}



/**

 * fscrypt_prepare_rename - prepare for a rename between possibly-encrypted directories

 * @old_dir: source directory

 * @old_dentry: dentry for source file

 * @new_dir: target directory

 * @new_dentry: dentry for target location (may be negative unless exchanging)

 * @flags: rename flags (we care at least about %RENAME_EXCHANGE)

 *

 * Prepare for ->rename() where the source and/or target directories may be

 * encrypted.  A new link can only be added to an encrypted directory if the

 * directory's encryption key is available --- since otherwise we'd have no way

 * to encrypt the filename.  A rename to an existing name, on the other hand,

 * *is* cryptographically possible without the key.  However, we take the more

 * conservative approach and just forbid all no-key renames.

 *

 * We also verify that the rename will not violate the constraint that all files

 * in an encrypted directory tree use the same encryption policy.

 *

 * Return: 0 on success, -ENOKEY if an encryption key is missing, -EPERM if the

 * rename would cause inconsistent encryption policies, or another -errno code.

 */

static inline int fscrypt_prepare_rename(struct inode *old_dir,

					 struct dentry *old_dentry,

					 struct inode *new_dir,

					 struct dentry *new_dentry,

					 unsigned int flags)

{

	if (IS_ENCRYPTED(old_dir) || IS_ENCRYPTED(new_dir))

		return __fscrypt_prepare_rename(old_dir, old_dentry,

						new_dir, new_dentry, flags);

	return 0;

}



#endif	/* _LINUX_FSCRYPT_H */

include/linux/fscrypt_notsupp.h

+9 −0
Original line number Diff line number Diff line
@@ -192,4 +192,13 @@ static inline int __fscrypt_prepare_link(struct inode *inode, 
	return -EOPNOTSUPP;

}



static inline int __fscrypt_prepare_rename(struct inode *old_dir,

					   struct dentry *old_dentry,

					   struct inode *new_dir,

					   struct dentry *new_dentry,

					   unsigned int flags)

{

	return -EOPNOTSUPP;

}



#endif	/* _LINUX_FSCRYPT_NOTSUPP_H */

include/linux/fscrypt_supp.h

+5 −0
Original line number Diff line number Diff line
@@ -146,5 +146,10 @@ extern int fscrypt_zeroout_range(const struct inode *, pgoff_t, sector_t, 
/* hooks.c */

extern int fscrypt_file_open(struct inode *inode, struct file *filp);

extern int __fscrypt_prepare_link(struct inode *inode, struct inode *dir);

extern int __fscrypt_prepare_rename(struct inode *old_dir,

				    struct dentry *old_dentry,

				    struct inode *new_dir,

				    struct dentry *new_dentry,

				    unsigned int flags);



#endif	/* _LINUX_FSCRYPT_SUPP_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE