* [PATCH] ext[34]: fix double put in tmpfile
@ 2013-10-10 14:48 Miklos Szeredi
2013-10-15 16:15 ` Al Viro
0 siblings, 1 reply; 2+ messages in thread
From: Miklos Szeredi @ 2013-10-10 14:48 UTC (permalink / raw)
To: Al Viro; +Cc: linux-fsdevel, linux-kernel
From: Miklos Szeredi <mszeredi@suse.cz>
d_tmpfile() already swallowed the inode ref.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: stable@vger.kernel.org
---
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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ext[34]: fix double put in tmpfile
2013-10-10 14:48 [PATCH] ext[34]: fix double put in tmpfile Miklos Szeredi
@ 2013-10-15 16:15 ` Al Viro
0 siblings, 0 replies; 2+ messages in thread
From: Al Viro @ 2013-10-15 16:15 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: linux-fsdevel, linux-kernel
On Thu, Oct 10, 2013 at 04:48:19PM +0200, Miklos Szeredi wrote:
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> d_tmpfile() already swallowed the inode ref.
>
> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
> Cc: stable@vger.kernel.org
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-15 16:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-10 14:48 [PATCH] ext[34]: fix double put in tmpfile Miklos Szeredi
2013-10-15 16:15 ` Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome