From: Chandan Rajendra <chandan@linux.ibm.com>
To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-fscrypt@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.ibm.com>,
tytso@mit.edu, adilger.kernel@dilger.ca, ebiggers@kernel.org,
jaegeuk@kernel.org, yuchao0@huawei.com
Subject: [PATCH V1 04/14] fsverity: Add call back to determine readpage limit
Date: Wed, 24 Apr 2019 10:07:20 +0530 [thread overview]
Message-ID: <20190424043730.13683-5-chandan@linux.ibm.com> (raw)
In-Reply-To: <20190424043730.13683-1-chandan@linux.ibm.com>
Ext4 and F2FS store verity metadata beyond i_size. This commit adds a
call back pointer to "struct fsverity_operations" which helps in
determining the the real file size limit upto which data can be read
from the file.
This call back will be required in order to get do_mpage_readpage()
to read files having verity metadata appended beyond i_size.
Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com>
---
fs/ext4/super.c | 17 +++++++++++++++++
include/linux/fsverity.h | 1 +
2 files changed, 18 insertions(+)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 63d73b360f1d..8e483afbaa2e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1428,6 +1428,22 @@ static struct page *ext4_read_verity_metadata_page(struct inode *inode,
return read_mapping_page(inode->i_mapping, index, NULL);
}
+static loff_t ext4_readpage_limit(struct inode *inode)
+{
+ if (IS_VERITY(inode)) {
+ if (inode->i_verity_info)
+ /* limit to end of metadata region */
+ return fsverity_full_i_size(inode);
+ /*
+ * fsverity_info is currently being set up and no user reads are
+ * allowed yet. It's easiest to just not enforce a limit yet.
+ */
+ return inode->i_sb->s_maxbytes;
+ }
+
+ return i_size_read(inode);
+}
+
static bool ext4_verity_required(struct inode *inode, pgoff_t index)
{
return index < (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;
@@ -1438,6 +1454,7 @@ static const struct fsverity_operations ext4_verityops = {
.get_metadata_end = ext4_get_verity_metadata_end,
.read_metadata_page = ext4_read_verity_metadata_page,
.verity_required = ext4_verity_required,
+ .readpage_limit = ext4_readpage_limit,
};
#endif /* CONFIG_FS_VERITY */
diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h
index b83712d6c79a..fc8113acbbfe 100644
--- a/include/linux/fsverity.h
+++ b/include/linux/fsverity.h
@@ -19,6 +19,7 @@ struct fsverity_operations {
int (*get_metadata_end)(struct inode *inode, loff_t *metadata_end_ret);
struct page *(*read_metadata_page)(struct inode *inode, pgoff_t index);
bool (*verity_required)(struct inode *inode, pgoff_t index);
+ loff_t (*readpage_limit)(struct inode *inode);
};
#ifdef CONFIG_FS_VERITY
--
2.19.1
next prev parent reply other threads:[~2019-04-24 4:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 4:37 [PATCH V1 00/14] Consolidate Post read processing code Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 01/14] ext4: Clear BH_Uptodate flag on decryption error Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 02/14] Consolidate "post read processing" into a new file Chandan Rajendra
2019-04-24 5:35 ` Christoph Hellwig
2019-04-24 10:04 ` Chandan Rajendra
2019-04-24 14:24 ` Christoph Hellwig
2019-04-24 14:59 ` Chandan Rajendra
2019-04-24 8:31 ` Jaegeuk Kim
2019-04-24 11:01 ` Chandan Rajendra
2019-04-24 12:06 ` Jaegeuk Kim
2019-04-24 14:49 ` Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 03/14] fsverity: Add call back to decide if verity check has to be performed Chandan Rajendra
2019-04-24 4:37 ` Chandan Rajendra [this message]
2019-04-24 4:37 ` [PATCH V1 05/14] fs/mpage.c: Integrate post read processing Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 06/14] ext4: Wire up ext4_readpage[s] to use mpage_readpage[s] Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 07/14] Remove the term "bio" from post read processing Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 08/14] Add decryption support for sub-pagesized blocks Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 09/14] ext4: Decrypt all boundary blocks when doing buffered write Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 10/14] ext4: Decrypt the block that needs to be partially zeroed Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 11/14] fscrypt_encrypt_page: Loop across all blocks mapped by a page range Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 12/14] ext4: Compute logical block and the page range to be encrypted Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 13/14] fscrypt_zeroout_range: Encrypt all zeroed out blocks of a page Chandan Rajendra
2019-04-24 4:37 ` [PATCH V1 14/14] ext4: Enable encryption for subpage-sized blocks Chandan Rajendra
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=20190424043730.13683-5-chandan@linux.ibm.com \
--to=chandan@linux.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=yuchao0@huawei.com \
/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).