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

Commit fa41a133 authored by zhengliang's avatar zhengliang Committed by Greg Kroah-Hartman
Browse files

ext4: lost matching-pair of trace in ext4_truncate 



[ Upstream commit 9a5d265fed014115f35e598022c956e5d2fb863e ]

It should call trace exit in all return path for ext4_truncate.

Signed-off-by: default avatarzhengliang <zhengliang6@huawei.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Reviewed-by: default avatarRitesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/20200701083027.45996-1-zhengliang6@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: a71248b1accb ("ext4: fix use-after-free in ext4_orphan_cleanup")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1d552483

fs/ext4/inode.c

+9 −8
Original line number Diff line number Diff line
@@ -4539,7 +4539,7 @@ int ext4_truncate(struct inode *inode) 
	trace_ext4_truncate_enter(inode);



	if (!ext4_can_truncate(inode))

		return 0;

		goto out_trace;



	ext4_clear_inode_flag(inode, EXT4_INODE_EOFBLOCKS);
@@ -4550,16 +4550,14 @@ int ext4_truncate(struct inode *inode) 
		int has_inline = 1;



		err = ext4_inline_data_truncate(inode, &has_inline);

		if (err)

			return err;

		if (has_inline)

			return 0;

		if (err || has_inline)

			goto out_trace;

	}



	/* If we zero-out tail of the page, we have to create jinode for jbd2 */

	if (inode->i_size & (inode->i_sb->s_blocksize - 1)) {

		if (ext4_inode_attach_jinode(inode) < 0)

			return 0;

			goto out_trace;

	}



	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
@@ -4568,8 +4566,10 @@ int ext4_truncate(struct inode *inode) 
		credits = ext4_blocks_for_truncate(inode);



	handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);

	if (IS_ERR(handle))

		return PTR_ERR(handle);

	if (IS_ERR(handle)) {

		err = PTR_ERR(handle);

		goto out_trace;

	}



	if (inode->i_size & (inode->i_sb->s_blocksize - 1))

		ext4_block_truncate_page(handle, mapping, inode->i_size);
@@ -4618,6 +4618,7 @@ int ext4_truncate(struct inode *inode) 
	ext4_mark_inode_dirty(handle, inode);

	ext4_journal_stop(handle);



out_trace:

	trace_ext4_truncate_exit(inode);

	return err;

}