2013-10-10 14:47:37

by Miklos Szeredi

Subject: [PATCH] ext[34]: fix double put in tmpfile

From: Miklos Szeredi <[email protected]>

d_tmpfile() already swallowed the inode ref.

Signed-off-by: Miklos Szeredi <[email protected]>
Cc: [email protected]
---
fs/ext3/namei.c | 5 ++---
fs/ext4/namei.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)

--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2319,7 +2319,7 @@ static int ext4_tmpfile(struct inode *di
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 *di
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;
}

--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1783,7 +1783,7 @@ static int ext3_tmpfile(struct inode *di
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 *di
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;
}

2013-10-15 16:15:08

by Al Viro

Subject: Re: [PATCH] ext[34]: fix double put in tmpfile

On Thu, Oct 10, 2013 at 04:48:19PM +0200, Miklos Szeredi wrote:
> From: Miklos Szeredi <[email protected]>
>
> d_tmpfile() already swallowed the inode ref.
>
> Signed-off-by: Miklos Szeredi <[email protected]>
> Cc: [email protected]

Applied.