diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-07-01 16:25:55 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-05 10:12:55 -0400 |
| commit | 1cfdc4477456476fe4a3b7c025deb6577acea2fa (patch) | |
| tree | de8424f715bab4ddb65e50976b089a6741150e6e | |
| parent | 3e3deab3acaf752c4de0daf0ec4cd8c47c3bab0e (diff) | |
fuse: initialize fc->release before calling it
[ Upstream commit 0ad0b3255a08020eaf50e34ef0d6df5bdf5e09ed ]
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+
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 03246cd9d47a..9e3f6cfee2fb 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1049,6 +1049,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; @@ -1063,7 +1064,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; |