[PATCH v2 087/109] virtiofsd: use fuse_lowlevel_is_virtio() in fuse_session_destroy()

From: Stefan Hajnoczi <stefanha@redhat.com>

vu_socket_path is NULL when --fd=FDNUM was used.  Use
fuse_lowlevel_is_virtio() instead.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tools/virtiofsd/fuse_lowlevel.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 6e8c30fd9b..fe332bcb90 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2541,12 +2541,13 @@ void fuse_session_destroy(struct fuse_session *se)
         close(se->fd);
     }
 
-    if (se->vu_socket_path) {
+    if (fuse_lowlevel_is_virtio(se)) {
         virtio_session_close(se);
-        free(se->vu_socket_path);
-        se->vu_socket_path = NULL;
     }
 
+    free(se->vu_socket_path);
+    se->vu_socket_path = NULL;
+
     free(se);
 }
 
-- 
2.24.1

• [PATCH v2 001/109] virtiofsd: Pull in upstream headers
• [PATCH v2 002/109] virtiofsd: Pull in kernel's fuse.h
• [PATCH v2 003/109] virtiofsd: Add auxiliary .c's
• [PATCH v2 004/109] virtiofsd: Add fuse_lowlevel.c
• [PATCH v2 005/109] virtiofsd: Add passthrough_ll
• [PATCH v2 006/109] virtiofsd: Trim down imported files
• [PATCH v2 007/109] virtiofsd: Format imported files to qemu style
• [PATCH v2 008/109] virtiofsd: remove mountpoint dummy argument
• [PATCH v2 009/109] virtiofsd: remove unused notify reply support
• [PATCH v2 010/109] virtiofsd: Fix fuse_daemonize ignored return values
• [PATCH v2 011/109] virtiofsd: Fix common header and define for QEMU builds
• [PATCH v2 012/109] virtiofsd: Trim out compatibility code
• [PATCH v2 013/109] vitriofsd/passthrough_ll: fix fallocate() ifdefs
• [PATCH v2 014/109] virtiofsd: Make fsync work even if only inode is passed in
• [PATCH v2 015/109] virtiofsd: Add options for virtio
• [PATCH v2 016/109] virtiofsd: add -o source=PATH to help output
• [PATCH v2 017/109] virtiofsd: Open vhost connection instead of mounting
• [PATCH v2 018/109] virtiofsd: Start wiring up vhost-user
• [PATCH v2 019/109] virtiofsd: Add main virtio loop
• [PATCH v2 020/109] virtiofsd: get/set features callbacks
• [PATCH v2 021/109] virtiofsd: Start queue threads
• [PATCH v2 022/109] virtiofsd: Poll kick_fd for queue
• [PATCH v2 023/109] virtiofsd: Start reading commands from queue
• [PATCH v2 024/109] virtiofsd: Send replies to messages
• [PATCH v2 025/109] virtiofsd: Keep track of replies
• [PATCH v2 026/109] virtiofsd: Add Makefile wiring for virtiofsd contrib
• [PATCH v2 027/109] virtiofsd: Fast path for virtio read
• [PATCH v2 028/109] virtiofsd: add --fd=FDNUM fd passing option
• [PATCH v2 029/109] virtiofsd: make -f (foreground) the default
• [PATCH v2 030/109] virtiofsd: add vhost-user.json file
• [PATCH v2 031/109] virtiofsd: add --print-capabilities option
• [PATCH v2 032/109] virtiofs: Add maintainers entry
• [PATCH v2 033/109] virtiofsd: passthrough_ll: create new files in caller's context
• [PATCH v2 034/109] virtiofsd: passthrough_ll: add lo_map for ino/fh indirection
• [PATCH v2 035/109] virtiofsd: passthrough_ll: add ino_map to hide lo_inode pointers
• [PATCH v2 036/109] virtiofsd: passthrough_ll: add dirp_map to hide lo_dirp pointers
• [PATCH v2 037/109] virtiofsd: passthrough_ll: add fd_map to hide file descriptors
• [PATCH v2 038/109] virtiofsd: passthrough_ll: add fallback for racy ops
• [PATCH v2 039/109] virtiofsd: validate path components
• [PATCH v2 040/109] virtiofsd: Plumb fuse_bufvec through to do_write_buf
• [PATCH v2 041/109] virtiofsd: Pass write iov's all the way through
• [PATCH v2 042/109] virtiofsd: add fuse_mbuf_iter API
• [PATCH v2 043/109] virtiofsd: validate input buffer sizes in do_write_buf()
• [PATCH v2 044/109] virtiofsd: check input buffer size in fuse_lowlevel.c ops
• [PATCH v2 045/109] virtiofsd: prevent ".." escape in lo_do_lookup()
• [PATCH v2 046/109] virtiofsd: prevent ".." escape in lo_do_readdir()
• [PATCH v2 047/109] virtiofsd: use /proc/self/fd/ O_PATH file descriptor
• [PATCH v2 048/109] virtiofsd: sandbox mount namespace
• [PATCH v2 049/109] virtiofsd: move to an empty network namespace
• [PATCH v2 050/109] virtiofsd: move to a new pid namespace
• [PATCH v2 051/109] virtiofsd: add seccomp whitelist
• [PATCH v2 052/109] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV
• [PATCH v2 053/109] virtiofsd: cap-ng helpers
• [PATCH v2 054/109] virtiofsd: Drop CAP_FSETID if client asked for it
• [PATCH v2 055/109] virtiofsd: set maximum RLIMIT_NOFILE limit
• [PATCH v2 056/109] virtiofsd: fix libfuse information leaks
• [PATCH v2 057/109] docs: Add docs/tools
• [PATCH v2 058/109] virtiofsd: add security guide document
• [PATCH v2 059/109] virtiofsd: add --syslog command-line option
• [PATCH v2 060/109] virtiofsd: print log only when priority is high enough
• [PATCH v2 061/109] virtiofsd: Add ID to the log with FUSE_LOG_DEBUG level
• [PATCH v2 062/109] virtiofsd: Add timestamp to the log with FUSE_LOG_DEBUG level
• [PATCH v2 063/109] virtiofsd: Handle reinit
• [PATCH v2 064/109] virtiofsd: Handle hard reboot
• [PATCH v2 065/109] virtiofsd: Kill threads when queues are stopped
• [PATCH v2 066/109] vhost-user: Print unexpected slave message types
• [PATCH v2 067/109] contrib/libvhost-user: Protect slave fd with mutex
• [PATCH v2 068/109] virtiofsd: passthrough_ll: add renameat2 support
• [PATCH v2 069/109] virtiofsd: passthrough_ll: disable readdirplus on cache=never
• [PATCH v2 070/109] virtiofsd: passthrough_ll: control readdirplus
• [PATCH v2 071/109] virtiofsd: rename unref_inode() to unref_inode_lolocked()
• [PATCH v2 072/109] virtiofsd: fail when parent inode isn't known in lo_do_lookup()
• [PATCH v2 073/109] virtiofsd: extract root inode init into setup_root()
• [PATCH v2 074/109] virtiofsd: passthrough_ll: clean up cache related options
• [PATCH v2 075/109] virtiofsd: passthrough_ll: use hashtable
• [PATCH v2 076/109] virtiofsd: Clean up inodes on destroy
• [PATCH v2 077/109] virtiofsd: support nanosecond resolution for file timestamp
• [PATCH v2 078/109] virtiofsd: fix error handling in main()
• [PATCH v2 079/109] virtiofsd: cleanup allocated resource in se
• [PATCH v2 080/109] virtiofsd: fix memory leak on lo.source
• [PATCH v2 081/109] virtiofsd: add helper for lo_data cleanup
• [PATCH v2 082/109] virtiofsd: Prevent multiply running with same vhost_user_socket
• [PATCH v2 083/109] virtiofsd: enable PARALLEL_DIROPS during INIT
• [PATCH v2 084/109] virtiofsd: fix incorrect error handling in lo_do_lookup
• [PATCH v2 085/109] Virtiofsd: fix memory leak on fuse queueinfo
• [PATCH v2 086/109] virtiofsd: Support remote posix locks
• [PATCH v2 087/109] virtiofsd: use fuse_lowlevel_is_virtio() in fuse_session_destroy()
• [PATCH v2 088/109] virtiofsd: prevent fv_queue_thread() vs virtio_loop() races
• [PATCH v2 089/109] virtiofsd: make lo_release() atomic
• [PATCH v2 090/109] virtiofsd: prevent races with lo_dirp_put()
• [PATCH v2 091/109] virtiofsd: rename inode->refcount to inode->nlookup
• [PATCH v2 092/109] libvhost-user: Fix some memtable remap cases
• [PATCH v2 093/109] virtiofsd: add man page
• [PATCH v2 094/109] virtiofsd: passthrough_ll: fix refcounting on remove/rename
• [PATCH v2 095/109] virtiofsd: introduce inode refcount to prevent use-after-free
• [PATCH v2 096/109] virtiofsd: do not always set FUSE_FLOCK_LOCKS
• [PATCH v2 097/109] virtiofsd: convert more fprintf and perror to use fuse log infra
• [PATCH v2 098/109] virtiofsd: Reset O_DIRECT flag during file open
• [PATCH v2 099/109] virtiofsd: Fix data corruption with O_APPEND write in writeback mode
• [PATCH v2 100/109] virtiofsd: add definition of fuse_buf_writev()
• [PATCH v2 101/109] virtiofsd: use fuse_buf_writev to replace fuse_buf_write for better performance
• [PATCH v2 102/109] virtiofsd: process requests in a thread pool
• [PATCH v2 103/109] virtiofsd: prevent FUSE_INIT/FUSE_DESTROY races
• [PATCH v2 104/109] virtiofsd: fix lo_destroy() resource leaks
• [PATCH v2 105/109] virtiofsd: add --thread-pool-size=NUM option
• [PATCH v2 106/109] virtiofsd: Convert lo_destroy to take the lo->mutex lock itself
• [PATCH v2 107/109] virtiofsd/passthrough_ll: Pass errno to fuse_reply_err()
• [PATCH v2 108/109] virtiofsd: stop all queue threads on exit in virtio_loop()
• [PATCH v2 109/109] virtiofsd: add some options to the help message