From: Eric Van Hensbergen Handle a failing sget() in v9fs_get_sb(). Signed-off-by: Christoph Hellwig Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton --- fs/9p/vfs_super.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff -puN fs/9p/vfs_super.c~9p-handle-sget-failure fs/9p/vfs_super.c --- 25/fs/9p/vfs_super.c~9p-handle-sget-failure Mon Apr 3 15:56:56 2006 +++ 25-akpm/fs/9p/vfs_super.c Mon Apr 3 15:56:56 2006 @@ -127,12 +127,13 @@ static struct super_block *v9fs_get_sb(s if ((newfid = v9fs_session_init(v9ses, dev_name, data)) < 0) { dprintk(DEBUG_ERROR, "problem initiating session\n"); - kfree(v9ses); - return ERR_PTR(newfid); + sb = ERR_PTR(newfid); + goto out_free_session; } sb = sget(fs_type, NULL, v9fs_set_super, v9ses); - + if (IS_ERR(sb)) + goto out_close_session; v9fs_fill_super(sb, v9ses, flags); inode = v9fs_get_inode(sb, S_IFDIR | mode); @@ -185,6 +186,12 @@ static struct super_block *v9fs_get_sb(s return sb; +out_close_session: + v9fs_session_close(v9ses); +out_free_session: + kfree(v9ses); + return sb; + put_back_sb: /* deactivate_super calls v9fs_kill_super which will frees the rest */ up_write(&sb->s_umount); _