Skip to content

Commit

Permalink
9p: Fix possible regressions when ->get_sb fails.
Browse files Browse the repository at this point in the history
->get_sb can fail causing some badness. this patch fixes
   * clear sb->fs_s_info in kill_sb.
   * deactivate_locked_super() calls kill_sb (v9fs_kill_super) which closes the
     destroys the client, clunks all its fids and closes the v9fs session.
     Attempting to do it twice will cause an oops.

Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  • Loading branch information
Abhishek Kulkarni authored and Eric Van Hensbergen committed Aug 17, 2009
1 parent 4f40383 commit 1b5ab3e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions fs/9p/vfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,

P9_DPRINTK(P9_DEBUG_VFS, " \n");

st = NULL;
v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL);
if (!v9ses)
return -ENOMEM;
Expand Down Expand Up @@ -173,10 +172,8 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");
simple_set_mnt(mnt, sb);
return 0;

release_sb:
deactivate_locked_super(sb);

free_stat:
p9stat_free(st);
kfree(st);

clunk_fid:
Expand All @@ -185,7 +182,12 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");
close_session:
v9fs_session_close(v9ses);
kfree(v9ses);
return retval;

release_sb:
p9stat_free(st);
kfree(st);
deactivate_locked_super(sb);
return retval;
}

Expand All @@ -207,6 +209,7 @@ static void v9fs_kill_super(struct super_block *s)

v9fs_session_close(v9ses);
kfree(v9ses);
s->s_fs_info = NULL;
P9_DPRINTK(P9_DEBUG_VFS, "exiting kill_super\n");
}

Expand Down

0 comments on commit 1b5ab3e

Please sign in to comment.