Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cfdc447 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Sasha Levin
Browse files

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: default avatarMiklos Szeredi <mszeredi@suse.cz>
Fixes: a325f9b9 ("fuse: update fuse_conn_init() and separate out fuse_conn_kill()")
Cc: <stable@vger.kernel.org> #v2.6.31+
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 3e3deab3

fs/fuse/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1049,6 +1049,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) 
		goto err_fput;

		goto err_fput;





	fuse_conn_init(fc);

	fuse_conn_init(fc);

	fc->release = fuse_free_conn;





	fc->dev = sb->s_dev;

	fc->dev = sb->s_dev;

	fc->sb = sb;

	fc->sb = sb;
@@ -1063,7 +1064,6 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) 
		fc->dont_mask = 1;

		fc->dont_mask = 1;

	sb->s_flags |= MS_POSIXACL;

	sb->s_flags |= MS_POSIXACL;





	fc->release = fuse_free_conn;

	fc->flags = d.flags;

	fc->flags = d.flags;

	fc->user_id = d.user_id;

	fc->user_id = d.user_id;

	fc->group_id = d.group_id;

	fc->group_id = d.group_id;