Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

eCryptfs: Use entire helper page during page crypto operations

Browse Source 
When encrypting eCryptfs pages and decrypting pages from the lower
filesystem, utilize the entire helper page rather than only the first
4096 bytes.

This only affects architectures where PAGE_CACHE_SIZE is larger than
4096 bytes.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Tyler Hicks 2013-04-16 23:21:24 -07:00
parent fc8b14d338
commit 12003e5b18
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/ecryptfs/crypto.c
View File

@ -450,9 +450,10 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
(unsigned long long)(extent_base + extent_offset), rc);
goto out;
}
rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page, 0,
page, (extent_offset
* crypt_stat->extent_size),
rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page,
extent_offset * crypt_stat->extent_size,
page,
extent_offset * crypt_stat->extent_size,
crypt_stat->extent_size, extent_iv);
if (rc < 0) {
printk(KERN_ERR "%s: Error attempting to encrypt page with "
@ -520,7 +521,8 @@ int ecryptfs_encrypt_page(struct page *page)
* (PAGE_CACHE_SIZE
/ crypt_stat->extent_size))
+ extent_offset), crypt_stat);
rc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt,
rc = ecryptfs_write_lower(ecryptfs_inode, (enc_extent_virt +
extent_offset * crypt_stat->extent_size),
offset, crypt_stat->extent_size);
if (rc < 0) {
ecryptfs_printk(KERN_ERR, "Error attempting "
@ -558,9 +560,9 @@ static int ecryptfs_decrypt_extent(struct page *page,
goto out;
}
rc = ecryptfs_decrypt_page_offset(crypt_stat, page,
(extent_offset
* crypt_stat->extent_size),
enc_extent_page, 0,
extent_offset * crypt_stat->extent_size,
enc_extent_page,
extent_offset * crypt_stat->extent_size,
crypt_stat->extent_size, extent_iv);
if (rc < 0) {
printk(KERN_ERR "%s: Error attempting to decrypt to page with "
@ -620,8 +622,9 @@ int ecryptfs_decrypt_page(struct page *page)
&offset, ((page->index * (PAGE_CACHE_SIZE
/ crypt_stat->extent_size))
+ extent_offset), crypt_stat);
rc = ecryptfs_read_lower(enc_extent_virt, offset,
crypt_stat->extent_size,
rc = ecryptfs_read_lower((enc_extent_virt +
extent_offset * crypt_stat->extent_size),
offset, crypt_stat->extent_size,
ecryptfs_inode);
if (rc < 0) {
ecryptfs_printk(KERN_ERR, "Error attempting "