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

Commit 20dd2c4e authored by Vasily Averin's avatar Vasily Averin Committed by Greg Kroah-Hartman
Browse files

ext4: avoid potential extra brelse in setup_new_flex_group_blocks() 



commit 9e4028935cca3f9ef9b6a90df9da6f1f94853536 upstream.

Currently bh is set to NULL only during first iteration of for cycle,
then this pointer is not cleared after end of using.
Therefore rollback after errors can lead to extra brelse(bh) call,
decrements bh counter and later trigger an unexpected warning in __brelse()

Patch moves brelse() calls in body of cycle to exclude requirement of
brelse() call in rollback.

Fixes: 33afdcc5 ("ext4: add a function which sets up group blocks ...")
Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 3.3+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2aa79d31

fs/ext4/resize.c

+2 −6
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ static int setup_new_flex_group_blocks(struct super_block *sb, 
		bh = bclean(handle, sb, block);

		if (IS_ERR(bh)) {

			err = PTR_ERR(bh);

			bh = NULL;

			goto out;

		}

		overhead = ext4_group_overhead_blocks(sb, group);
@@ -620,9 +619,9 @@ static int setup_new_flex_group_blocks(struct super_block *sb, 
		ext4_mark_bitmap_end(EXT4_B2C(sbi, group_data[i].blocks_count),

				     sb->s_blocksize * 8, bh->b_data);

		err = ext4_handle_dirty_metadata(handle, NULL, bh);

		brelse(bh);

		if (err)

			goto out;

		brelse(bh);



handle_ib:

		if (bg_flags[i] & EXT4_BG_INODE_UNINIT)
@@ -637,18 +636,16 @@ static int setup_new_flex_group_blocks(struct super_block *sb, 
		bh = bclean(handle, sb, block);

		if (IS_ERR(bh)) {

			err = PTR_ERR(bh);

			bh = NULL;

			goto out;

		}



		ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb),

				     sb->s_blocksize * 8, bh->b_data);

		err = ext4_handle_dirty_metadata(handle, NULL, bh);

		brelse(bh);

		if (err)

			goto out;

		brelse(bh);

	}

	bh = NULL;



	/* Mark group tables in block bitmap */

	for (j = 0; j < GROUP_TABLE_COUNT; j++) {
@@ -687,7 +684,6 @@ static int setup_new_flex_group_blocks(struct super_block *sb, 
	}



out:

	brelse(bh);

	err2 = ext4_journal_stop(handle);

	if (err2 && !err)

		err = err2;