aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-03-15 14:16:32 -0700
committerTheodore Ts'o <tytso@mit.edu>2019-04-16 18:44:44 -0400
commitff5d3a97075c65731a46453d36e75b9cf925e165 (patch)
tree8f45dad94b8d4aa47315eba32133a15f9e91c1cb
parentcd0265fcd2eae9004c68ef2123a9dac0dc5a666a (diff)
downloadfscrypt-ff5d3a97075c65731a46453d36e75b9cf925e165.tar.gz
fscrypt: remove WARN_ON_ONCE() when decryption fails
If decrypting a block fails, fscrypt did a WARN_ON_ONCE(). But WARN is meant for kernel bugs, which this isn't; this could be hit by fuzzers using fault injection, for example. Also, there is already a proper warning message logged in fscrypt_do_page_crypto(), so the WARN doesn't add much. Just remove the unnessary WARN. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/crypto/bio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index f5b69b9531f68..41dde4578f3b2 100644
--- a/fs/crypto/bio.c
+++ b/fs/crypto/bio.c
@@ -37,12 +37,10 @@ static void __fscrypt_decrypt_bio(struct bio *bio, bool done)
int ret = fscrypt_decrypt_page(page->mapping->host, page,
PAGE_SIZE, 0, page->index);
- if (ret) {
- WARN_ON_ONCE(1);
+ if (ret)
SetPageError(page);
- } else if (done) {
+ else if (done)
SetPageUptodate(page);
- }
if (done)
unlock_page(page);
}