diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-12-26 09:41:05 -0600 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2020-01-17 16:24:53 -0500 |
| commit | 834f1565fa3f9c8f78adbfcaa80ae510fe4971c3 (patch) | |
| tree | ce4bcf3c476b6edd1e66975e54965c1bf9b316f7 /fs/ext4 | |
| parent | docs: ext4.rst: add encryption and verity to features list (diff) | |
| download | linux-dev-834f1565fa3f9c8f78adbfcaa80ae510fe4971c3.tar.xz linux-dev-834f1565fa3f9c8f78adbfcaa80ae510fe4971c3.zip | |
ext4: handle decryption error in __ext4_block_zero_page_range()
fscrypt_decrypt_pagecache_blocks() can fail, because it uses
skcipher_request_alloc(), which uses kmalloc(), which can fail; and also
because it calls crypto_skcipher_decrypt(), which can fail depending on
the driver that actually implements the crypto.
Therefore it's not appropriate to WARN on decryption error in
__ext4_block_zero_page_range().
Remove the WARN and just handle the error instead.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191226154105.4704-1-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9100460d92e5..d3e1539c680b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3725,8 +3725,12 @@ static int __ext4_block_zero_page_range(handle_t *handle, if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode)) { /* We expect the key to be set. */ BUG_ON(!fscrypt_has_encryption_key(inode)); - WARN_ON_ONCE(fscrypt_decrypt_pagecache_blocks( - page, blocksize, bh_offset(bh))); + err = fscrypt_decrypt_pagecache_blocks(page, blocksize, + bh_offset(bh)); + if (err) { + clear_buffer_uptodate(bh); + goto unlock; + } } } if (ext4_should_journal_data(inode)) { |