Skip to content

Commit

Permalink
Fix double-free in logfs
Browse files Browse the repository at this point in the history
iput() is needed *until* we'd done successful d_alloc_root()

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed May 15, 2010
1 parent d83c49f commit 2656244
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions fs/logfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,27 +333,27 @@ static int logfs_get_sb_final(struct super_block *sb, struct vfsmount *mnt)
goto fail;

sb->s_root = d_alloc_root(rootdir);
if (!sb->s_root)
goto fail2;
if (!sb->s_root) {
iput(rootdir);
goto fail;
}

super->s_erase_page = alloc_pages(GFP_KERNEL, 0);
if (!super->s_erase_page)
goto fail2;
goto fail;
memset(page_address(super->s_erase_page), 0xFF, PAGE_SIZE);

/* FIXME: check for read-only mounts */
err = logfs_make_writeable(sb);
if (err)
goto fail3;
goto fail1;

log_super("LogFS: Finished mounting\n");
simple_set_mnt(mnt, sb);
return 0;

fail3:
fail1:
__free_page(super->s_erase_page);
fail2:
iput(rootdir);
fail:
iput(logfs_super(sb)->s_master_inode);
return -EIO;
Expand Down

0 comments on commit 2656244

Please sign in to comment.