| Message ID | 20170523003945.14279-5-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 written to, 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 ->write_iter(). > > 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 | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index ff4db3efc0ac..3ccc63089a47 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -2318,11 +2318,6 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) > struct blk_plug plug; > ssize_t ret; > > - if (f2fs_encrypted_inode(inode) && > - !fscrypt_has_encryption_key(inode) && > - fscrypt_get_encryption_info(inode)) > - return -EACCES; > - > inode_lock(inode); > ret = generic_write_checks(iocb, from); > if (ret > 0) { > -- 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 ff4db3efc0ac..3ccc63089a47 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2318,11 +2318,6 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) struct blk_plug plug; ssize_t ret; - if (f2fs_encrypted_inode(inode) && - !fscrypt_has_encryption_key(inode) && - fscrypt_get_encryption_info(inode)) - return -EACCES; - inode_lock(inode); ret = generic_write_checks(iocb, from); if (ret > 0) {