aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-07-01 16:25:55 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:18 +0200
commit1a713f9828a6abd288ecc9eef0bbe5c56d0ffc0b (patch)
tree1748277594e86daefed8450a7e8663a79e97a814 /fs
parentf34a986bb4e1f8a97437bf68194297822d5b1fb4 (diff)
downloadkernel_samsung_smdk4412-1a713f9828a6abd288ecc9eef0bbe5c56d0ffc0b.zip
kernel_samsung_smdk4412-1a713f9828a6abd288ecc9eef0bbe5c56d0ffc0b.tar.gz
kernel_samsung_smdk4412-1a713f9828a6abd288ecc9eef0bbe5c56d0ffc0b.tar.bz2
fuse: initialize fc->release before calling it
commit 0ad0b3255a08020eaf50e34ef0d6df5bdf5e09ed upstream. 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()") Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index afc0f70..e613870 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -993,6 +993,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;
@@ -1007,7 +1008,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;