summaryrefslogtreecommitdiffstats
path: root/fs/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2016-09-08 11:36:39 -0700
committerTheodore Ts'o <tytso@mit.edu>2016-09-09 23:38:12 -0400
commit002ced4be6429918800ce3e41d5cbc2d7c01822c (patch)
tree2a25e775ca7ae0a8af8426267cd4f832e0fac0f6 /fs/crypto
parent163ae1c6ad6299b19e22b4a35d5ab24a89791a98 (diff)
downloadop-kernel-dev-002ced4be6429918800ce3e41d5cbc2d7c01822c.zip
op-kernel-dev-002ced4be6429918800ce3e41d5cbc2d7c01822c.tar.gz
fscrypto: only allow setting encryption policy on directories
The FS_IOC_SET_ENCRYPTION_POLICY ioctl allowed setting an encryption policy on nondirectory files. This was unintentional, and in the case of nonempty regular files did not behave as expected because existing data was not actually encrypted by the ioctl. In the case of ext4, the user could also trigger filesystem errors in ->empty_dir(), e.g. due to mismatched "directory" checksums when the kernel incorrectly tried to interpret a regular file as a directory. This bug affected ext4 with kernels v4.8-rc1 or later and f2fs with kernels v4.6 and later. It appears that older kernels only permitted directories and that the check was accidentally lost during the refactoring to share the file encryption code between ext4 and f2fs. This patch restores the !S_ISDIR() check that was present in older kernels. Signed-off-by: Eric Biggers <ebiggers@google.com> Cc: stable@vger.kernel.org Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/crypto')
-rw-r--r--fs/crypto/policy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index c9800b1..f96547f 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -102,6 +102,8 @@ int fscrypt_process_policy(struct inode *inode,
return -EINVAL;
if (!inode_has_encryption_context(inode)) {
+ if (!S_ISDIR(inode->i_mode))
+ return -EINVAL;
if (!inode->i_sb->s_cop->empty_dir)
return -EOPNOTSUPP;
if (!inode->i_sb->s_cop->empty_dir(inode))
OpenPOWER on IntegriCloud