Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ecryptfs: Pass the folio index to crypt_extent()

Browse Source 
We need to pass pages, not folios, to crypt_extent() as we may be
working with a plain page rather than a folio.  But we need to know the
index in the file, so pass it in from the caller.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20241025190822.1319162-11-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-10-25 20:08:20 +01:00 committed by Christian Brauner
parent bf64913dfe
commit 9b4bb82244
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ecryptfs/crypto.c
View File

@ -340,6 +340,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
* encryption operation * encryption operation
* @dst_page: The page to write the result into * @dst_page: The page to write the result into
* @src_page: The page to read from * @src_page: The page to read from
* @page_index: The offset in the file (in units of PAGE_SIZE)
* @extent_offset: Page extent offset for use in generating IV * @extent_offset: Page extent offset for use in generating IV
* @op: ENCRYPT or DECRYPT to indicate the desired operation * @op: ENCRYPT or DECRYPT to indicate the desired operation
* *
@ -350,9 +351,9 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat, static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,
struct page *dst_page, struct page *dst_page,
struct page *src_page, struct page *src_page,
pgoff_t page_index,
unsigned long extent_offset, int op) unsigned long extent_offset, int op)
{ {
pgoff_t page_index = op == ENCRYPT ? src_page->index : dst_page->index;
loff_t extent_base; loff_t extent_base;
char extent_iv[ECRYPTFS_MAX_IV_BYTES]; char extent_iv[ECRYPTFS_MAX_IV_BYTES];
struct scatterlist src_sg, dst_sg; struct scatterlist src_sg, dst_sg;
@ -432,7 +433,8 @@ int ecryptfs_encrypt_page(struct folio *folio)
extent_offset < (PAGE_SIZE / crypt_stat->extent_size); extent_offset < (PAGE_SIZE / crypt_stat->extent_size);
extent_offset++) { extent_offset++) {
rc = crypt_extent(crypt_stat, enc_extent_page, rc = crypt_extent(crypt_stat, enc_extent_page,
folio_page(folio, 0), extent_offset, ENCRYPT); folio_page(folio, 0), folio->index,
extent_offset, ENCRYPT);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error encrypting extent; " printk(KERN_ERR "%s: Error encrypting extent; "
"rc = [%d]\n", __func__, rc); "rc = [%d]\n", __func__, rc);
@ -505,8 +507,8 @@ int ecryptfs_decrypt_page(struct folio *folio)
extent_offset < (PAGE_SIZE / crypt_stat->extent_size); extent_offset < (PAGE_SIZE / crypt_stat->extent_size);
extent_offset++) { extent_offset++) {
struct page *page = folio_page(folio, 0); struct page *page = folio_page(folio, 0);
rc = crypt_extent(crypt_stat, page, page, rc = crypt_extent(crypt_stat, page, page, folio->index,
extent_offset, DECRYPT); extent_offset, DECRYPT);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error decrypting extent; " printk(KERN_ERR "%s: Error decrypting extent; "
"rc = [%d]\n", __func__, rc); "rc = [%d]\n", __func__, rc);