AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

eCryptfs: Accept one offset parameter in page offset crypto functions

Browse Source 
There is no longer a need to accept different offset values for the
source and destination pages when encrypting/decrypting an extent in an
eCryptfs page. The two offsets can be collapsed into a single parameter.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Tyler Hicks 2013-04-15 16:37:27 -07:00
parent 24d15266bd
commit 28916d1ac1
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fs/ecryptfs/crypto.c
View File

@ -39,14 +39,12 @@
static int
ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
struct page *dst_page, int dst_offset,
struct page *src_page, int src_offset, int size,
unsigned char *iv);
struct page *dst_page, struct page *src_page,
int offset, int size, unsigned char *iv);
static int
ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
struct page *dst_page, int dst_offset,
struct page *src_page, int src_offset, int size,
unsigned char *iv);
struct page *dst_page, struct page *src_page,
int offset, int size, unsigned char *iv);
/**
* ecryptfs_to_hex
@ -450,9 +448,7 @@ 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,
extent_offset * crypt_stat->extent_size,
page,
rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page, page,
extent_offset * crypt_stat->extent_size,
crypt_stat->extent_size, extent_iv);
if (rc < 0) {
@ -555,9 +551,7 @@ static int ecryptfs_decrypt_extent(struct page *page,
(unsigned long long)(extent_base + extent_offset), rc);
goto out;
}
rc = ecryptfs_decrypt_page_offset(crypt_stat, page,
extent_offset * crypt_stat->extent_size,
enc_extent_page,
rc = ecryptfs_decrypt_page_offset(crypt_stat, page, enc_extent_page,
extent_offset * crypt_stat->extent_size,
crypt_stat->extent_size, extent_iv);
if (rc < 0) {
@ -716,9 +710,8 @@ static int decrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
* ecryptfs_encrypt_page_offset
* @crypt_stat: The cryptographic context
* @dst_page: The page to encrypt into
* @dst_offset: The offset in the page to encrypt into
* @src_page: The page to encrypt from
* @src_offset: The offset in the page to encrypt from
* @offset: The byte offset into the dst_page and src_page
* @size: The number of bytes to encrypt
* @iv: The initialization vector to use for the encryption
*
@ -726,17 +719,16 @@ static int decrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
*/
static int
ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
struct page *dst_page, int dst_offset,
struct page *src_page, int src_offset, int size,
unsigned char *iv)
struct page *dst_page, struct page *src_page,
int offset, int size, unsigned char *iv)
{
struct scatterlist src_sg, dst_sg;
sg_init_table(&src_sg, 1);
sg_init_table(&dst_sg, 1);
sg_set_page(&src_sg, src_page, size, src_offset);
sg_set_page(&dst_sg, dst_page, size, dst_offset);
sg_set_page(&src_sg, src_page, size, offset);
sg_set_page(&dst_sg, dst_page, size, offset);
return encrypt_scatterlist(crypt_stat, &dst_sg, &src_sg, size, iv);
}
@ -744,9 +736,8 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
* ecryptfs_decrypt_page_offset
* @crypt_stat: The cryptographic context
* @dst_page: The page to decrypt into
* @dst_offset: The offset in the page to decrypt into
* @src_page: The page to decrypt from
* @src_offset: The offset in the page to decrypt from
* @offset: The byte offset into the dst_page and src_page
* @size: The number of bytes to decrypt
* @iv: The initialization vector to use for the decryption
*
@ -754,17 +745,16 @@ ecryptfs_encrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
*/
static int
ecryptfs_decrypt_page_offset(struct ecryptfs_crypt_stat *crypt_stat,
struct page *dst_page, int dst_offset,
struct page *src_page, int src_offset, int size,
unsigned char *iv)
struct page *dst_page, struct page *src_page,
int offset, int size, unsigned char *iv)
{
struct scatterlist src_sg, dst_sg;
sg_init_table(&src_sg, 1);
sg_set_page(&src_sg, src_page, size, src_offset);
sg_set_page(&src_sg, src_page, size, offset);
sg_init_table(&dst_sg, 1);
sg_set_page(&dst_sg, dst_page, size, dst_offset);
sg_set_page(&dst_sg, dst_page, size, offset);
return decrypt_scatterlist(crypt_stat, &dst_sg, &src_sg, size, iv);
}