jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path

[pandora-kernel.git] / fs / jffs2 / fs.c

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 7286e44..05f4ae6 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -186,7 +186,7 @@ int jffs2_setattr(struct dentry *dentry, struct iattr *iattr)
 {
        int rc;
 
-       rc = inode_change_ok(dentry->d_inode, iattr);
+       rc = setattr_prepare(dentry, iattr);
        if (rc)
                return rc;
 
@@ -352,7 +352,6 @@ error_io:
        ret = -EIO;
 error:
        mutex_unlock(&f->sem);
-       jffs2_do_clear_inode(c, f);
        iget_failed(inode);
        return ERR_PTR(ret);
 }
@@ -379,7 +378,7 @@ void jffs2_dirty_inode(struct inode *inode, int flags)
        jffs2_do_setattr(inode, &iattr);
 }
 
-int jffs2_remount_fs (struct super_block *sb, int *flags, char *data)
+int jffs2_do_remount_fs(struct super_block *sb, int *flags, char *data)
 {
        struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);