Hi David and Richard,
On Mon, Apr 24, 2017 at 11:46:21PM +0200, Richard Weinberger wrote:
> From: David Oberhollenzer <david.oberhollenzer@xxxxxxxxxxxxx>
>
> If either source or destination directory is encrypted and the
> encryption key is unknown, make sure we return -ENOKEY instead
> of -EPERM, similar to how this case is handled in ext4.
>
> Signed-off-by: David Oberhollenzer <david.oberhollenzer@xxxxxxxxxxxxx>
> Signed-off-by: Richard Weinberger <richard@xxxxxx>
>
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index ff77a0aa2f2b..c342f23581d2 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -1340,6 +1340,12 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
> if (unlink)
> ubifs_assert(inode_is_locked(new_inode));
>
> + if ((ubifs_crypt_is_encrypted(old_dir) &&
> + !fscrypt_has_encryption_key(old_dir)) ||
> + (ubifs_crypt_is_encrypted(new_dir) &&
> + !fscrypt_has_encryption_key(new_dir)))
> + return -ENOKEY;
> +
> if (old_dir != new_dir) {
> if (ubifs_crypt_is_encrypted(new_dir) &&
> !fscrypt_has_permitted_context(new_dir, old_inode))
> @@ -1564,6 +1570,12 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry,
>
> ubifs_assert(fst_inode && snd_inode);
>
> + if ((ubifs_crypt_is_encrypted(old_dir) &&
> + !fscrypt_has_encryption_key(old_dir)) ||
> + (ubifs_crypt_is_encrypted(new_dir) &&
> + !fscrypt_has_encryption_key(new_dir)))
> + return -ENOKEY;
> +
> if ((ubifs_crypt_is_encrypted(old_dir) ||
> ubifs_crypt_is_encrypted(new_dir)) &&
> (old_dir != new_dir) &&
> --
Did you test that this change actually does anything? Unlike ext4 and f2fs,
ubifs calls fscrypt_setup_filename() from its rename methods rather than through
a helper function ${FS}_find_entry(). Therefore it's able to pass in lookup=0,
which means that the key is required. So it should already be failing with
ENOKEY. You can verify this by running xfstests generic/419.
- Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-fscrypt" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|