Commit 114c59d6 authored Dec 09, 2019 by Eric Biggers Committed by Alistair Delva Dec 10, 2019

ANDROID: f2fs: fix possible merge of unencrypted with encrypted I/O



f2fs_crypt_mergeable_bio() should return false when the next page will
be read/written as raw data but the pending bio will use encryption.

I'm not sure this actually fixes anything in practice, as I was unable
to reproduce this case.  But we should make this change to be safe.

Bug: 137270441
Bug: 144791323
Change-Id: Id6765c799a6c54fe1d9542d350c3e1c105dc3f60
Signed-off-by: Eric Biggers <ebiggers@google.com>

parent 725ce554

fs/f2fs/data.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,7 @@ static bool f2fs_crypt_mergeable_bio(struct bio bio, const struct inode inode,
		* read/write raw data without encryption.
		*/
		if (fio && fio->encrypted_page)
		return true;
		return !bio_has_crypt_ctx(bio);

		return fscrypt_mergeable_bio(bio, inode, next_idx);
		}