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

Commit ef2cabf7 authored by Hidehiro Kawai's avatar Hidehiro Kawai Committed by Theodore Ts'o
Browse files

ext4: fix a bug accessing freed memory in ext4_abort 



Vegard Nossum reported a bug which accesses freed memory (found via
kmemcheck).  When journal has been aborted, ext4_put_super() calls
ext4_abort() after freeing the journal_t object, and then ext4_abort()
accesses it.  This patch fix it.

Signed-off-by: default avatarHidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 44d6f787

fs/ext4/super.c

+7 −4
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ void ext4_abort(struct super_block *sb, const char *function, 
	EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;

	sb->s_flags |= MS_RDONLY;

	EXT4_SB(sb)->s_mount_opt |= EXT4_MOUNT_ABORT;

	if (EXT4_SB(sb)->s_journal)

		jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);

}
@@ -442,14 +443,16 @@ static void ext4_put_super(struct super_block *sb) 
{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_super_block *es = sbi->s_es;

	int i;

	int i, err;



	ext4_mb_release(sb);

	ext4_ext_release(sb);

	ext4_xattr_put_super(sb);

	if (jbd2_journal_destroy(sbi->s_journal) < 0)

		ext4_abort(sb, __func__, "Couldn't clean up the journal");

	err = jbd2_journal_destroy(sbi->s_journal);

	sbi->s_journal = NULL;

	if (err < 0)

		ext4_abort(sb, __func__, "Couldn't clean up the journal");



	if (!(sb->s_flags & MS_RDONLY)) {

		EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);

		es->s_state = cpu_to_le16(sbi->s_mount_state);