提交 0df5ed65 编写于 作者: T Tyler Hicks

eCryptfs: Make extent and scatterlist crypt function parameters similar

The 'dest' abbreviation is only used in crypt_scatterlist(), while all
other functions in crypto.c use 'dst' so dest_sg should be renamed to
dst_sg.

The crypt_stat parameter is typically the first parameter in internal
eCryptfs functions so crypt_stat and dst_page should be swapped in
crypt_extent().
Signed-off-by: NTyler Hicks <tyhicks@canonical.com>
上级 406c93df
...@@ -330,7 +330,7 @@ static void extent_crypt_complete(struct crypto_async_request *req, int rc) ...@@ -330,7 +330,7 @@ static void extent_crypt_complete(struct crypto_async_request *req, int rc)
/** /**
* crypt_scatterlist * crypt_scatterlist
* @crypt_stat: Pointer to the crypt_stat struct to initialize. * @crypt_stat: Pointer to the crypt_stat struct to initialize.
* @dest_sg: Destination of the data after performing the crypto operation * @dst_sg: Destination of the data after performing the crypto operation
* @src_sg: Data to be encrypted or decrypted * @src_sg: Data to be encrypted or decrypted
* @size: Length of data * @size: Length of data
* @iv: IV to use * @iv: IV to use
...@@ -339,7 +339,7 @@ static void extent_crypt_complete(struct crypto_async_request *req, int rc) ...@@ -339,7 +339,7 @@ static void extent_crypt_complete(struct crypto_async_request *req, int rc)
* Returns the number of bytes encrypted or decrypted; negative value on error * Returns the number of bytes encrypted or decrypted; negative value on error
*/ */
static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
struct scatterlist *dest_sg, struct scatterlist *dst_sg,
struct scatterlist *src_sg, int size, struct scatterlist *src_sg, int size,
unsigned char *iv, int op) unsigned char *iv, int op)
{ {
...@@ -384,7 +384,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, ...@@ -384,7 +384,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
crypt_stat->flags |= ECRYPTFS_KEY_SET; crypt_stat->flags |= ECRYPTFS_KEY_SET;
} }
mutex_unlock(&crypt_stat->cs_tfm_mutex); mutex_unlock(&crypt_stat->cs_tfm_mutex);
ablkcipher_request_set_crypt(req, src_sg, dest_sg, size, iv); ablkcipher_request_set_crypt(req, src_sg, dst_sg, size, iv);
rc = op == ENCRYPT ? crypto_ablkcipher_encrypt(req) : rc = op == ENCRYPT ? crypto_ablkcipher_encrypt(req) :
crypto_ablkcipher_decrypt(req); crypto_ablkcipher_decrypt(req);
if (rc == -EINPROGRESS || rc == -EBUSY) { if (rc == -EINPROGRESS || rc == -EBUSY) {
...@@ -413,9 +413,9 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat, ...@@ -413,9 +413,9 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
/** /**
* crypt_extent * crypt_extent
* @dst_page: The page to write the result into
* @crypt_stat: crypt_stat containing cryptographic context for the * @crypt_stat: crypt_stat containing cryptographic context for the
* encryption operation * encryption operation
* @dst_page: The page to write the result into
* @src_page: The page to read from * @src_page: The page to read from
* @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
...@@ -424,8 +424,8 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat, ...@@ -424,8 +424,8 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
* *
* Return zero on success; non-zero otherwise * Return zero on success; non-zero otherwise
*/ */
static int crypt_extent(struct page *dst_page, static int crypt_extent(struct ecryptfs_crypt_stat *crypt_stat,
struct ecryptfs_crypt_stat *crypt_stat, struct page *dst_page,
struct page *src_page, struct page *src_page,
unsigned long extent_offset, int op) unsigned long extent_offset, int op)
{ {
...@@ -508,7 +508,7 @@ int ecryptfs_encrypt_page(struct page *page) ...@@ -508,7 +508,7 @@ int ecryptfs_encrypt_page(struct page *page)
for (extent_offset = 0; for (extent_offset = 0;
extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size); extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
extent_offset++) { extent_offset++) {
rc = crypt_extent(enc_extent_page, crypt_stat, page, rc = crypt_extent(crypt_stat, enc_extent_page, page,
extent_offset, ENCRYPT); extent_offset, ENCRYPT);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error encrypting extent; " printk(KERN_ERR "%s: Error encrypting extent; "
...@@ -581,7 +581,7 @@ int ecryptfs_decrypt_page(struct page *page) ...@@ -581,7 +581,7 @@ int ecryptfs_decrypt_page(struct page *page)
for (extent_offset = 0; for (extent_offset = 0;
extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size); extent_offset < (PAGE_CACHE_SIZE / crypt_stat->extent_size);
extent_offset++) { extent_offset++) {
rc = crypt_extent(page, crypt_stat, page, rc = crypt_extent(crypt_stat, page, page,
extent_offset, DECRYPT); extent_offset, DECRYPT);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error encrypting extent; " printk(KERN_ERR "%s: Error encrypting extent; "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册