ext4: fix error handling in ext4_end_enable_verity()
authorEric Biggers <ebiggers@google.com>
Tue, 2 Mar 2021 20:04:19 +0000 (12:04 -0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 11 Mar 2021 15:38:50 +0000 (10:38 -0500)
commitf053cf7aa66cd9d592b0fc967f4d887c2abff1b7
tree0c81b0b773d4f5e5b595ced3b6953df807fa5276
parentc915fb80eaa6194fa9bd0a4487705cd5b0dda2f1
ext4: fix error handling in ext4_end_enable_verity()

ext4 didn't properly clean up if verity failed to be enabled on a file:

- It left verity metadata (pages past EOF) in the page cache, which
  would be exposed to userspace if the file was later extended.

- It didn't truncate the verity metadata at all (either from cache or
  from disk) if an error occurred while setting the verity bit.

Fix these bugs by adding a call to truncate_inode_pages() and ensuring
that we truncate the verity metadata (both from cache and from disk) in
all error paths.  Also rework the code to cleanly separate the success
path from the error paths, which makes it much easier to understand.

Reported-by: Yunlei He <heyunlei@hihonor.com>
Fixes: c93d8f885809 ("ext4: add basic fs-verity support")
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20210302200420.137977-2-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/verity.c