leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block()

Browse Source 
fscrypt_do_page_crypto() only does a single encryption or decryption
operation, with a single logical block number (single IV).  So it
actually operates on a filesystem block, not a "page" per se.  To
reflect this, rename it to fscrypt_crypt_block().

Reviewed-by: Chandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2019-05-20 09:29:41 -07:00
parent 2a415a0257
commit f47fcbb2b5
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/crypto/bio.c
View File

@ -83,9 +83,9 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
return -ENOMEM; return -ENOMEM;
while (len--) { while (len--) {
err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk, err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk,
ZERO_PAGE(0), ciphertext_page, ZERO_PAGE(0), ciphertext_page,
PAGE_SIZE, 0, GFP_NOFS); PAGE_SIZE, 0, GFP_NOFS);
if (err) if (err)
goto errout; goto errout;

24
fs/crypto/crypto.c
View File

@ -148,10 +148,11 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num,
crypto_cipher_encrypt_one(ci->ci_essiv_tfm, iv->raw, iv->raw); crypto_cipher_encrypt_one(ci->ci_essiv_tfm, iv->raw, iv->raw);
} }
int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw, /* Encrypt or decrypt a single filesystem block of file contents */
u64 lblk_num, struct page *src_page, int fscrypt_crypt_block(const struct inode *inode, fscrypt_direction_t rw,
struct page *dest_page, unsigned int len, u64 lblk_num, struct page *src_page,
unsigned int offs, gfp_t gfp_flags) struct page *dest_page, unsigned int len,
unsigned int offs, gfp_t gfp_flags)
{ {
union fscrypt_iv iv; union fscrypt_iv iv;
struct skcipher_request *req = NULL; struct skcipher_request *req = NULL;
@ -228,9 +229,9 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,
if (inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES) { if (inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES) {
/* with inplace-encryption we just encrypt the page */ /* with inplace-encryption we just encrypt the page */
err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, page, err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk_num, page,
ciphertext_page, len, offs, ciphertext_page, len, offs,
gfp_flags); gfp_flags);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
@ -244,9 +245,8 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,
if (!ciphertext_page) if (!ciphertext_page)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk_num, page,
page, ciphertext_page, len, offs, ciphertext_page, len, offs, gfp_flags);
gfp_flags);
if (err) { if (err) {
fscrypt_free_bounce_page(ciphertext_page); fscrypt_free_bounce_page(ciphertext_page);
return ERR_PTR(err); return ERR_PTR(err);
@ -278,8 +278,8 @@ int fscrypt_decrypt_page(const struct inode *inode, struct page *page,
if (!(inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES)) if (!(inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES))
BUG_ON(!PageLocked(page)); BUG_ON(!PageLocked(page));
return fscrypt_do_page_crypto(inode, FS_DECRYPT, lblk_num, page, page, return fscrypt_crypt_block(inode, FS_DECRYPT, lblk_num, page, page,
len, offs, GFP_NOFS); len, offs, GFP_NOFS);
} }
EXPORT_SYMBOL(fscrypt_decrypt_page); EXPORT_SYMBOL(fscrypt_decrypt_page);

11
fs/crypto/fscrypt_private.h
View File

@ -116,12 +116,11 @@ static inline bool fscrypt_valid_enc_modes(u32 contents_mode,
/* crypto.c */ /* crypto.c */
extern struct kmem_cache *fscrypt_info_cachep; extern struct kmem_cache *fscrypt_info_cachep;
extern int fscrypt_initialize(unsigned int cop_flags); extern int fscrypt_initialize(unsigned int cop_flags);
extern int fscrypt_do_page_crypto(const struct inode *inode, extern int fscrypt_crypt_block(const struct inode *inode,
fscrypt_direction_t rw, u64 lblk_num, fscrypt_direction_t rw, u64 lblk_num,
struct page *src_page, struct page *src_page, struct page *dest_page,
struct page *dest_page, unsigned int len, unsigned int offs,
unsigned int len, unsigned int offs, gfp_t gfp_flags);
gfp_t gfp_flags);
extern struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags); extern struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags);
extern const struct dentry_operations fscrypt_d_ops; extern const struct dentry_operations fscrypt_d_ops;