diff mbox series

fscrypt: remove WARN_ON_ONCE() when decryption fails

Message ID 20190315211632.231638-1-ebiggers@kernel.org (mailing list archive)
State Accepted
Headers show
Series fscrypt: remove WARN_ON_ONCE() when decryption fails | expand

Commit Message

Eric Biggers March 15, 2019, 9:16 p.m. UTC 
From: Eric Biggers <ebiggers@google.com>

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>
---
 fs/crypto/bio.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Theodore Ts'o April 16, 2019, 10:45 p.m. UTC | #1 
On Fri, Mar 15, 2019 at 02:16:32PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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>

Looks good, applied.

					- Ted
diff mbox series

Patch

diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index 5759bcd018cd..d7ad74818b2b 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);
 	}