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

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

fscrypt: fix race allowing rename() and link() of ciphertext dentries 



Close some race conditions where fscrypt allowed rename() and link() on
ciphertext dentries that had been looked up just prior to the key being
concurrently added.  It's better to return -ENOKEY in this case.

This avoids doing the nonsensical thing of encrypting the names a second
time when searching for the actual on-disk dir entries.  It also
guarantees that DCACHE_ENCRYPTED_NAME dentries are never rename()d, so
the dcache won't have support all possible combinations of moving
DCACHE_ENCRYPTED_NAME around during __d_move().

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

fs/crypto/hooks.c

+11 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ int fscrypt_file_open(struct inode *inode, struct file *filp) 
}

EXPORT_SYMBOL_GPL(fscrypt_file_open);



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

int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,

			   struct dentry *dentry)

{

	int err;
@@ -57,6 +58,10 @@ int __fscrypt_prepare_link(struct inode *inode, struct inode *dir) 
	if (err)

		return err;



	/* ... in case we looked up ciphertext name before key was added */

	if (dentry->d_flags & DCACHE_ENCRYPTED_NAME)

		return -ENOKEY;



	if (!fscrypt_has_permitted_context(dir, inode))

		return -EXDEV;
@@ -78,6 +83,11 @@ int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (err)

		return err;



	/* ... in case we looked up ciphertext name(s) before key was added */

	if ((old_dentry->d_flags | new_dentry->d_flags) &

	    DCACHE_ENCRYPTED_NAME)

		return -ENOKEY;



	if (old_dir != new_dir) {

		if (IS_ENCRYPTED(new_dir) &&

		    !fscrypt_has_permitted_context(new_dir,

include/linux/fscrypt.h

+5 −4
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ 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_link(struct inode *inode, struct inode *dir,

				  struct dentry *dentry);

extern int __fscrypt_prepare_rename(struct inode *old_dir,

				    struct dentry *old_dentry,

				    struct inode *new_dir,
@@ -397,8 +398,8 @@ static inline int fscrypt_file_open(struct inode *inode, struct file *filp) 
	return 0;

}



static inline int __fscrypt_prepare_link(struct inode *inode,

					 struct inode *dir)

static inline int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,

					 struct dentry *dentry)

{

	return -EOPNOTSUPP;

}
@@ -493,7 +494,7 @@ static inline int fscrypt_prepare_link(struct dentry *old_dentry, 
				       struct dentry *dentry)

{

	if (IS_ENCRYPTED(dir))

		return __fscrypt_prepare_link(d_inode(old_dentry), dir);

		return __fscrypt_prepare_link(d_inode(old_dentry), dir, dentry);

	return 0;

}