Skip to content

Commit

Permalink
ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
Browse files Browse the repository at this point in the history
...otherwise an user can enable encryption for certain files even
when the filesystem is unable to support it.
Such a case would be a filesystem created by mkfs.ext4's default
settings, 1KiB block size. Ext4 supports encyption only when block size
is equal to PAGE_SIZE.
But this constraint is only checked when the encryption feature flag
is set.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
richardweinberger authored and tytso committed Sep 30, 2016
1 parent 55be314 commit 9a200d0
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fs/ext4/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,9 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
#ifdef CONFIG_EXT4_FS_ENCRYPTION
struct fscrypt_policy policy;

if (!ext4_has_feature_encrypt(sb))
return -EOPNOTSUPP;

if (copy_from_user(&policy,
(struct fscrypt_policy __user *)arg,
sizeof(policy)))
Expand Down

0 comments on commit 9a200d0

Please sign in to comment.