summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/crypto_policy.c
diff options
context:
space:
mode:
authorChao Yu <chao2.yu@samsung.com>2016-02-14 18:58:35 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2016-02-22 16:07:23 -0800
commitae1086686487f13130937918ca91d920c1daafcb (patch)
tree7868f8e4b1850e6f4ea2492567203ccae695c7ee /fs/f2fs/crypto_policy.c
parented3360abbc0412f32c398e1c58887d74f3d04225 (diff)
downloadop-kernel-dev-ae1086686487f13130937918ca91d920c1daafcb.zip
op-kernel-dev-ae1086686487f13130937918ca91d920c1daafcb.tar.gz
f2fs crypto: handle unexpected lack of encryption keys
This patch syncs f2fs with commit abdd438b26b4 ("ext4 crypto: handle unexpected lack of encryption keys") from ext4. Fix up attempts by users to try to write to a file when they don't have access to the encryption key. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Chao Yu <chao2.yu@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/crypto_policy.c')
-rw-r--r--fs/f2fs/crypto_policy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c
index d4a96af..596f024 100644
--- a/fs/f2fs/crypto_policy.c
+++ b/fs/f2fs/crypto_policy.c
@@ -192,7 +192,8 @@ int f2fs_inherit_context(struct inode *parent, struct inode *child,
return res;
ci = F2FS_I(parent)->i_crypt_info;
- BUG_ON(ci == NULL);
+ if (ci == NULL)
+ return -ENOKEY;
ctx.format = F2FS_ENCRYPTION_CONTEXT_FORMAT_V1;
OpenPOWER on IntegriCloud