diff options
| author | Chao Yu <yuchao0@huawei.com> | 2019-08-04 17:56:43 +0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-08-31 10:00:29 -0500 |
| commit | 0642ea2409f3bfa105570e12854b8e2628db6835 (patch) | |
| tree | b3dfaed17f4b630fa39ec54c47c8f010dcfef73f /fs/ext4 | |
| parent | ba13f2c8d7a08362d519c8f91c846a8987b8df5f (diff) | |
| download | linux-0642ea2409f3bfa105570e12854b8e2628db6835.tar.gz linux-0642ea2409f3bfa105570e12854b8e2628db6835.tar.bz2 linux-0642ea2409f3bfa105570e12854b8e2628db6835.zip | |
ext4 crypto: fix to check feature status before get policy
When getting fscrypt policy via EXT4_IOC_GET_ENCRYPTION_POLICY, if
encryption feature is off, it's better to return EOPNOTSUPP instead of
ENODATA, so let's add ext4_has_feature_encrypt() to do the check for
that.
This makes it so that all fscrypt ioctls consistently check for the
encryption feature, and makes ext4 consistent with f2fs in this regard.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
[EB - removed unneeded braces, updated the documentation, and
added more explanation to commit message]
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index fe5a4b13f939..5703d607f5af 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -1113,6 +1113,8 @@ resizefs_out: #endif } case EXT4_IOC_GET_ENCRYPTION_POLICY: + if (!ext4_has_feature_encrypt(sb)) + return -EOPNOTSUPP; return fscrypt_ioctl_get_policy(filp, (void __user *)arg); case FS_IOC_GET_ENCRYPTION_POLICY_EX: |