diff options
| author | Chao Yu <chao2.yu@samsung.com> | 2016-02-14 18:58:35 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-04 14:49:13 -0700 |
| commit | 629a4956e0ea66c5ff4d1bc5bbb2d5deca4e3908 (patch) | |
| tree | e2da9c4b77e930221277c5a25ed968e4adf2e5c1 | |
| parent | 73b5a1883361c3a0bd328ba8fa1348e09594229d (diff) | |
| download | lwn-629a4956e0ea66c5ff4d1bc5bbb2d5deca4e3908.tar.gz lwn-629a4956e0ea66c5ff4d1bc5bbb2d5deca4e3908.zip | |
f2fs crypto: handle unexpected lack of encryption keys
commit ae1086686487f13130937918ca91d920c1daafcb upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/f2fs/crypto_policy.c | 3 | ||||
| -rw-r--r-- | fs/f2fs/file.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c index d4a96af513c2..596f02490f27 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; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index ea272be62677..5a322bc00ac4 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -425,6 +425,8 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) err = f2fs_get_encryption_info(inode); if (err) return 0; + if (!f2fs_encrypted_inode(inode)) + return -ENOKEY; } /* we don't need to use inline_data strictly */ @@ -444,7 +446,9 @@ static int f2fs_file_open(struct inode *inode, struct file *filp) if (!ret && f2fs_encrypted_inode(inode)) { ret = f2fs_get_encryption_info(inode); if (ret) - ret = -EACCES; + return -EACCES; + if (!f2fs_encrypted_inode(inode)) + return -ENOKEY; } return ret; } |