On Thu, Dec 12, 2019 at 04:38:38PM +0000, Dr. David Alan Gilbert (git) wrote: > From: Liu Bo <bo.liu@linux.alibaba.com> > > This cleans up unfreed resources in se on quiting, including > se->virtio_dev, se->vu_socket_path, se->vu_socketfd. > > Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com> > --- > tools/virtiofsd/fuse_lowlevel.c | 7 +++++++ > tools/virtiofsd/fuse_virtio.c | 7 +++++++ > tools/virtiofsd/fuse_virtio.h | 2 +- > 3 files changed, 15 insertions(+), 1 deletion(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index 45125ef66a..14c9d99374 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -2539,6 +2539,13 @@ void fuse_session_destroy(struct fuse_session *se) if (se->fd != -1) { close(se->fd); } + + if (se->vu_socket_path) { + virtio_session_close(se); + free(se->vu_socket_path); + se->vu_socket_path = NULL; + } + free(se); } diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 2f11fee46d..1b5d27fe16 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -827,3 +827,10 @@ int virtio_session_mount(struct fuse_session *se) return 0; } + +void virtio_session_close(struct fuse_session *se) +{ + close(se->vu_socketfd); + free(se->virtio_dev); + se->virtio_dev = NULL; +} diff --git a/tools/virtiofsd/fuse_virtio.h b/tools/virtiofsd/fuse_virtio.h index cc676b9193..111684032c 100644 --- a/tools/virtiofsd/fuse_virtio.h +++ b/tools/virtiofsd/fuse_virtio.h @@ -19,7 +19,7 @@ struct fuse_session; int virtio_session_mount(struct fuse_session *se); - +void virtio_session_close(struct fuse_session *se); int virtio_loop(struct fuse_session *se);