diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-05-20 18:29:42 +0200 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-05-28 19:27:52 +0200 |
| commit | eeacfdc68a104967162dfcba60f53f6f5b62a334 (patch) | |
| tree | 13a3375c24a8c9ab9fa14ec9e03560780e8e3e2a /fs/crypto/crypto.c | |
| parent | fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block() (diff) | |
| download | linux-eeacfdc68a104967162dfcba60f53f6f5b62a334.tar.xz linux-eeacfdc68a104967162dfcba60f53f6f5b62a334.zip | |
fscrypt: clean up some BUG_ON()s in block encryption/decryption
Replace some BUG_ON()s with WARN_ON_ONCE() and returning an error code,
and move the check for len divisible by FS_CRYPTO_BLOCK_SIZE into
fscrypt_crypt_block() so that it's done for both encryption and
decryption, not just encryption.
Reviewed-by: Chandan Rajendra <chandan@linux.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto/crypto.c')
| -rw-r--r-- | fs/crypto/crypto.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index a798c52e3dc9..59337287e580 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -162,7 +162,10 @@ int fscrypt_crypt_block(const struct inode *inode, fscrypt_direction_t rw, struct crypto_skcipher *tfm = ci->ci_ctfm; int res = 0; - BUG_ON(len == 0); + if (WARN_ON_ONCE(len <= 0)) + return -EINVAL; + if (WARN_ON_ONCE(len % FS_CRYPTO_BLOCK_SIZE != 0)) + return -EINVAL; fscrypt_generate_iv(&iv, lblk_num, ci); @@ -225,8 +228,6 @@ struct page *fscrypt_encrypt_page(const struct inode *inode, struct page *ciphertext_page = page; int err; - BUG_ON(len % FS_CRYPTO_BLOCK_SIZE != 0); - if (inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES) { /* with inplace-encryption we just encrypt the page */ err = fscrypt_crypt_block(inode, FS_ENCRYPT, lblk_num, page, @@ -238,7 +239,8 @@ struct page *fscrypt_encrypt_page(const struct inode *inode, return ciphertext_page; } - BUG_ON(!PageLocked(page)); + if (WARN_ON_ONCE(!PageLocked(page))) + return ERR_PTR(-EINVAL); /* The encryption operation will require a bounce page. */ ciphertext_page = fscrypt_alloc_bounce_page(gfp_flags); @@ -275,8 +277,9 @@ EXPORT_SYMBOL(fscrypt_encrypt_page); int fscrypt_decrypt_page(const struct inode *inode, struct page *page, unsigned int len, unsigned int offs, u64 lblk_num) { - if (!(inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES)) - BUG_ON(!PageLocked(page)); + if (WARN_ON_ONCE(!PageLocked(page) && + !(inode->i_sb->s_cop->flags & FS_CFLG_OWN_PAGES))) + return -EINVAL; return fscrypt_crypt_block(inode, FS_DECRYPT, lblk_num, page, page, len, offs, GFP_NOFS); |