Skip to content

Commit

Permalink
virtiofs: fix userns
Browse files Browse the repository at this point in the history
[ Upstream commit 0a7419c ]

get_user_ns() is done twice (once in virtio_fs_get_tree() and once in
fuse_conn_init()), resulting in a reference leak.

Also looks better to use fsc->user_ns (which *should* be the
current_user_ns() at this point).

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Miklos Szeredi authored and gregkh committed May 19, 2021
1 parent 87fe0ca commit 2c20c7d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions fs/fuse/virtio_fs.c
Expand Up @@ -1457,8 +1457,7 @@ static int virtio_fs_get_tree(struct fs_context *fsc)
return -ENOMEM;
}

fuse_conn_init(fc, fm, get_user_ns(current_user_ns()),
&virtio_fs_fiq_ops, fs);
fuse_conn_init(fc, fm, fsc->user_ns, &virtio_fs_fiq_ops, fs);
fc->release = fuse_free_conn;
fc->delete_stale = true;
fc->auto_submounts = true;
Expand Down

0 comments on commit 2c20c7d

Please sign in to comment.