Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c74e6f authored by Steven J. Magnani's avatar Steven J. Magnani Committed by Greg Kroah-Hartman
Browse files

udf: fix silent AED tagLocation corruption

[ Upstream commit 63c9e47a1642fc817654a1bc18a6ec4bbcc0f056 ]

When extending a file, udf_do_extend_file() may enter following empty
indirect extent. At the end of udf_do_extend_file() we revert prev_epos
to point to the last written extent. However if we end up not adding any
further extent in udf_do_extend_file(), the reverting points prev_epos
into the header area of the AED and following updates of the extents
(in udf_update_extents()) will corrupt the header.

Make sure that we do not follow indirect extent if we are not going to
add any more extents so that returning back to the last written extent
works correctly.

Link: https://lore.kernel.org/r/20210107234116.6190-2-magnani@ieee.org


Signed-off-by: default avatarSteven J. Magnani <magnani@ieee.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ebe4ab97
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -540,10 +540,13 @@ static int udf_do_extend_file(struct inode *inode,

		udf_write_aext(inode, last_pos, &last_ext->extLocation,
				last_ext->extLength, 1);

		/*
		 * We've rewritten the last extent but there may be empty
		 * indirect extent after it - enter it.
		 * We've rewritten the last extent. If we are going to add
		 * more extents, we may need to enter possible following
		 * empty indirect extent.
		 */
		if (new_block_bytes || prealloc_len)
			udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0);
	}