diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:25:55 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:15 +0200 |
| commit | 9e5594d2355aa943785206cb7634826f77547253 (patch) | |
| tree | 67f27c9858b34f361c6f1b692d721a97a0604454 /fs | |
| parent | 0c301ef6ace4b60c4d4016492a192e72496fefb1 (diff) | |
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>
(cherry picked from commit 1a713f9828a6abd288ecc9eef0bbe5c56d0ffc0b)
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs')
| -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 c95186c345ad..71b0cf08656a 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -970,6 +970,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; @@ -984,7 +985,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; |