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

Commit 8c68face authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 bugfix from Ted Ts'o.

[ Hmm.  It's possible we should make kfree() aware of error pointers,
  and use IS_ERR_OR_NULL rather than a NULL check.  But in the meantime
  this is obviously the right fix.  - Linus ]

* 'for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: avoid trying to kfree an ERR_PTR pointer
parents 861b7102 a9cfcd63

fs/ext4/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -3240,6 +3240,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, 
				 &new.de, &new.inlined);

	if (IS_ERR(new.bh)) {

		retval = PTR_ERR(new.bh);

		new.bh = NULL;

		goto end_rename;

	}

	if (new.bh) {
@@ -3386,6 +3387,7 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
				 &new.de, &new.inlined);

	if (IS_ERR(new.bh)) {

		retval = PTR_ERR(new.bh);

		new.bh = NULL;

		goto end_rename;

	}

fs/ext4/resize.c

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ 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);
@@ -603,6 +604,7 @@ 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;

		}