| Message ID | 20180522160110.1161-7-chandan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 736d209b..fbc89d9 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4050,9 +4050,10 @@ static int __ext4_block_zero_page_range(handle_t *handle, ext4_encrypted_inode(inode)) { /* We expect the key to be set. */ BUG_ON(!fscrypt_has_encryption_key(inode)); - BUG_ON(blocksize != PAGE_SIZE); WARN_ON_ONCE(fscrypt_decrypt_page(page->mapping->host, - page, PAGE_SIZE, 0, page->index)); + page, blocksize, + round_down(offset, blocksize), + iblock)); } } if (ext4_should_journal_data(inode)) {
__ext4_block_zero_page_range decrypts the entire page. With block size < page size this assumption is incorrect since the block to be decrypted spans a sub-range of the page. This commit now passes the block's offset within the page and also the length of the block as arguments to fscrypt_decrypt_page(). Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> --- fs/ext4/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)