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

Commit 0056019d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull tmpfile fix from Al Viro:
 "A fix for double iput() in ->tmpfile() on ext3 and ext4; I'd fucked it
  up, Miklos has caught it"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext[34]: fix double put in tmpfile
parents 8359ffa5 43ae9e3f

fs/ext3/namei.c

+2 −3
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ static int ext3_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 
		d_tmpfile(dentry, inode);

		err = ext3_orphan_add(handle, inode);

		if (err)

			goto err_drop_inode;

			goto err_unlock_inode;

		mark_inode_dirty(inode);

		unlock_new_inode(inode);

	}
@@ -1791,10 +1791,9 @@ static int ext3_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 
	if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))

		goto retry;

	return err;

err_drop_inode:

err_unlock_inode:

	ext3_journal_stop(handle);

	unlock_new_inode(inode);

	iput(inode);

	return err;

}

fs/ext4/namei.c

+2 −3
Original line number Diff line number Diff line
@@ -2319,7 +2319,7 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 
		d_tmpfile(dentry, inode);

		err = ext4_orphan_add(handle, inode);

		if (err)

			goto err_drop_inode;

			goto err_unlock_inode;

		mark_inode_dirty(inode);

		unlock_new_inode(inode);

	}
@@ -2328,10 +2328,9 @@ static int ext4_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 
	if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))

		goto retry;

	return err;

err_drop_inode:

err_unlock_inode:

	ext4_journal_stop(handle);

	unlock_new_inode(inode);

	iput(inode);

	return err;

}