diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-11 11:48:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-11 11:48:48 -0700 |
| commit | ae4d972f07f97de9a368a33820a7fe38284498c2 (patch) | |
| tree | 1623f306d0ce384e259cf36f2cab84dffbc9dcc2 /fs/ext4/ioctl.c | |
| parent | 24638027f19a0294d10dc9b49a2d21051030bc47 (diff) | |
| parent | 7e061af6db97a51e9c89bcef7c2317b13cc79699 (diff) | |
Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"
Diffstat (limited to 'fs/ext4/ioctl.c')
| -rw-r--r-- | fs/ext4/ioctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 3a2594665b44..c21826be1cb3 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -626,6 +626,9 @@ resizefs_out: struct ext4_encryption_policy policy; int err = 0; + if (!ext4_has_feature_encrypt(sb)) + return -EOPNOTSUPP; + if (copy_from_user(&policy, (struct ext4_encryption_policy __user *)arg, sizeof(policy))) { |