| Message ID | 20170523003945.14279-3-ebiggers3@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 2017/5/23 8:39, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > Since only an open file can be mmap'ed, and we only allow open()ing an > encrypted file when its key is available, there is no need to check for > the key again before permitting each mmap(). > > This f2fs copy of this code was also broken in that it wouldn't actually > have failed if the key was in fact unavailable. > > Signed-off-by: Eric Biggers <ebiggers@google.com> Acked-by: Chao Yu <yuchao0@huawei.com> Thanks, > --- > fs/f2fs/file.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 61af721329fa..ff4db3efc0ac 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -415,14 +415,6 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) > struct inode *inode = file_inode(file); > int err; > > - if (f2fs_encrypted_inode(inode)) { > - err = fscrypt_get_encryption_info(inode); > - if (err) > - return 0; > - if (!f2fs_encrypted_inode(inode)) > - return -ENOKEY; > - } > - > /* we don't need to use inline_data strictly */ > err = f2fs_convert_inline_inode(inode); > if (err) > -- To unsubscribe from this list: send the line "unsubscribe linux-fscrypt" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 61af721329fa..ff4db3efc0ac 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -415,14 +415,6 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) struct inode *inode = file_inode(file); int err; - if (f2fs_encrypted_inode(inode)) { - err = fscrypt_get_encryption_info(inode); - if (err) - return 0; - if (!f2fs_encrypted_inode(inode)) - return -ENOKEY; - } - /* we don't need to use inline_data strictly */ err = f2fs_convert_inline_inode(inode); if (err)