diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:25:55 +0200 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:25:55 +0200 |
commit | 0ad0b3255a08020eaf50e34ef0d6df5bdf5e09ed (patch) | |
tree | 73639ca76562a5ac8d2471cc1b2a1c0d1f5eb5f1 /fs/fuse | |
parent | b953c0d234bc72e8489d3bf51a276c5c4ec85345 (diff) | |
download | blackbird-op-linux-0ad0b3255a08020eaf50e34ef0d6df5bdf5e09ed.tar.gz blackbird-op-linux-0ad0b3255a08020eaf50e34ef0d6df5bdf5e09ed.zip |
fuse: initialize fc->release before calling it
fc->release is called from fuse_conn_put() which was used in the error
cleanup before fc->release was initialized.
[Jeremiah Mahler <jmmahler@gmail.com>: assign fc->release after calling
fuse_conn_init(fc) instead of before.]
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Fixes: a325f9b92273 ("fuse: update fuse_conn_init() and separate out fuse_conn_kill()")
Cc: <stable@vger.kernel.org> #v2.6.31+
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 082ac1c97f39..cec8abbe2c8c 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1026,6 +1026,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) goto err_fput; fuse_conn_init(fc); + fc->release = fuse_free_conn; fc->dev = sb->s_dev; fc->sb = sb; @@ -1040,7 +1041,6 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) fc->dont_mask = 1; sb->s_flags |= MS_POSIXACL; - fc->release = fuse_free_conn; fc->flags = d.flags; fc->user_id = d.user_id; fc->group_id = d.group_id; |