From: Yunlei He <heyunlei@hihonor.com>
To: chao@kernel.org, jaegeuk@kernel.org, ebiggers@kernel.org
Cc: linux-f2fs-devel@lists.sourceforge.net,
linux-fscrypt@vger.kernel.org, bintian.wang@hihonor.com,
Yunlei He <heyunlei@hihonor.com>,
stable@vger.kernel.org
Subject: [f2fs-dev][PATCH v2] f2fs: fsverity: Truncate cache pages if set verity failed
Date: Mon, 1 Mar 2021 22:15:06 +0800 [thread overview]
Message-ID: <20210301141506.6410-1-heyunlei@hihonor.com> (raw)
If file enable verity failed, should truncate anything wrote
past i_size, including cache pages.
Fixes: 95ae251fe828 ("f2fs: add fs-verity support")
Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: Yunlei He <heyunlei@hihonor.com>
---
fs/f2fs/verity.c | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
index 054ec852b5ea..3aa851affc46 100644
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -158,33 +158,36 @@ static int f2fs_end_enable_verity(struct file *filp, const void *desc,
.size = cpu_to_le32(desc_size),
.pos = cpu_to_le64(desc_pos),
};
- int err = 0;
+ int err;
- if (desc != NULL) {
- /* Succeeded; write the verity descriptor. */
- err = pagecache_write(inode, desc, desc_size, desc_pos);
+ clear_inode_flag(inode, FI_VERITY_IN_PROGRESS);
+ if (!desc)
+ return 0;
- /* Write all pages before clearing FI_VERITY_IN_PROGRESS. */
- if (!err)
- err = filemap_write_and_wait(inode->i_mapping);
- }
+ /* Succeeded; write the verity descriptor. */
+ err = pagecache_write(inode, desc, desc_size, desc_pos);
+ if (err)
+ goto out;
- /* If we failed, truncate anything we wrote past i_size. */
- if (desc == NULL || err)
- f2fs_truncate(inode);
+ err = filemap_write_and_wait(inode->i_mapping);
+ if (err)
+ goto out;
- clear_inode_flag(inode, FI_VERITY_IN_PROGRESS);
+ err = f2fs_setxattr(inode, F2FS_XATTR_INDEX_VERITY,
+ F2FS_XATTR_NAME_VERITY, &dloc, sizeof(dloc),
+ NULL, XATTR_CREATE);
+ if (err)
+ goto out;
- if (desc != NULL && !err) {
- err = f2fs_setxattr(inode, F2FS_XATTR_INDEX_VERITY,
- F2FS_XATTR_NAME_VERITY, &dloc, sizeof(dloc),
- NULL, XATTR_CREATE);
- if (!err) {
- file_set_verity(inode);
- f2fs_set_inode_flags(inode);
- f2fs_mark_inode_dirty_sync(inode, true);
- }
- }
+ file_set_verity(inode);
+ f2fs_set_inode_flags(inode);
+ f2fs_mark_inode_dirty_sync(inode, true);
+
+ return 0;
+out:
+ /* If we failed, truncate anything we wrote past i_size. */
+ truncate_inode_pages(inode->i_mapping, inode->i_size);
+ f2fs_truncate(inode);
return err;
}
--
2.17.1
next reply other threads:[~2021-03-01 14:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 14:15 Yunlei He [this message]
2021-03-01 18:38 ` [PATCH v2] f2fs: fsverity: Truncate cache pages if set verity failed Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210301141506.6410-1-heyunlei@hihonor.com \
--to=heyunlei@hihonor.com \
--cc=bintian.wang@hihonor.com \
--cc=chao@kernel.org \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).