summaryrefslogtreecommitdiff
path: root/fs/ext4/crypto_policy.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-05-31 13:35:39 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-05-31 13:35:39 -0400
commitabdd438b26b409eaccf9c847fcf9c3ab52f1959e (patch)
tree4473a3667ab265065f0ce81b49d76e8c095b19d2 /fs/ext4/crypto_policy.c
parent4d3c4e5b8cae3bb45ba933a22670504239958aa1 (diff)
ext4 crypto: handle unexpected lack of encryption keys
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>
Diffstat (limited to 'fs/ext4/crypto_policy.c')
-rw-r--r--fs/ext4/crypto_policy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/crypto_policy.c b/fs/ext4/crypto_policy.c
index a1d434d0dea8..02c4e5df7afb 100644
--- a/fs/ext4/crypto_policy.c
+++ b/fs/ext4/crypto_policy.c
@@ -183,7 +183,8 @@ int ext4_inherit_context(struct inode *parent, struct inode *child)
if (res < 0)
return res;
ci = EXT4_I(parent)->i_crypt_info;
- BUG_ON(ci == NULL);
+ if (ci == NULL)
+ return -ENOKEY;
ctx.format = EXT4_ENCRYPTION_CONTEXT_FORMAT_V1;
if (DUMMY_ENCRYPTION_ENABLED(EXT4_SB(parent->i_sb))) {