diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
commit | 734bcf32c23442e81891641ae05e08108a4010d5 (patch) | |
tree | b41cc318506b0c38ddf404520ba67753f3ab5452 /fs/f2fs | |
parent | 551569f25ec07596e144ffbc7911dd631645e63b (diff) | |
parent | 8d5e93bb8c9c48ee5948f6b1aff0e895381f09e6 (diff) |
Merge tag 'v4.4.22' into android-4.4.y
This is the 4.4.22 stable release
Change-Id: Id49e3c87d2cacb2fa85d85a17226f718f4a5ac28
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/crypto_policy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c index d4a96af513c2..e504f548b64e 100644 --- a/fs/f2fs/crypto_policy.c +++ b/fs/f2fs/crypto_policy.c @@ -89,6 +89,9 @@ static int f2fs_create_encryption_context_from_policy( int f2fs_process_policy(const struct f2fs_encryption_policy *policy, struct inode *inode) { + if (!inode_owner_or_capable(inode)) + return -EACCES; + if (policy->version != 0) return -EINVAL; |