From nobody Fri Oct 3 11:32:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579809853; cv=none; d=zohomail.com; s=zohoarc; b=N/mcumUcscsHemzKQ4I7JYFjB0iPjMiDHejPCN2mt1nCmzP3cxWskvKj12pO1kCgUrpd+S3cAskEkRMlOciNo/Va4dJsYswPiBkbiknjCkUWQwrdkfDOH8ur/31gLhSMBPKlYcZslmUDbj869mHk7+7L0de9DAds3omPKrXDfF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579809853; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WzLbAZP9WfpE8TnNXdwCvu1MiJ4/z6YtXfDuOOsI480=; b=J8iADU29slnvRJYIbQXF8Le8VlgKcqtTx2Z/UUNUi9VRygSspEY1+w17dIycdIr/+PCn8YnnY+hE7/tnkNIpdkTi4Ju6HJSpvV4XVhHPlwR5gIXDjxPGJbHjGW2AjFSY44eO5bTn1A8gokK60g/I38VaP1iOsQJFIckERZoan54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579809853223288.2796413199842; Thu, 23 Jan 2020 12:04:13 -0800 (PST) Received: from localhost ([::1]:32882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuii4-0005B4-3t for importer@patchew.org; Thu, 23 Jan 2020 15:04:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42408) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufel-0005yA-Vk for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufek-0008Da-S9 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:35 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:59037 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufek-0008CO-P3 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-BQtUtkXzP12FCtR15Vydig-1; Thu, 23 Jan 2020 11:48:32 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 017C292780 for ; Thu, 23 Jan 2020 16:48:32 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE4419C69; Thu, 23 Jan 2020 16:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WzLbAZP9WfpE8TnNXdwCvu1MiJ4/z6YtXfDuOOsI480=; b=ZhxitubSyfJWoh3NyyBhdE3QUGMyRiGrji8NnkZa6zntMeTSQ6jTmkP7gR5jNdZPFDdlb6 m8A5RMJv08gBkWtT4EnxM/ZXVWSq9bK74d8uguKwGCo0yiHsFbQojYwn6/U8M6lVbwMfQ0 X+rOi5oN2Ld7TSLE/t5uxsomuydNoNM= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 086/108] virtiofsd: use fuse_lowlevel_is_virtio() in fuse_session_destroy() Date: Thu, 23 Jan 2020 16:46:08 +0000 Message-Id: <20200123164630.91498-87-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: BQtUtkXzP12FCtR15Vydig-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi vu_socket_path is NULL when --fd=3DFDNUM was used. Use fuse_lowlevel_is_virtio() instead. Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- 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_lowleve= l.c index 70568d22a4..dab6a31e08 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -2537,12 +2537,13 @@ void fuse_session_destroy(struct fuse_session *se) close(se->fd); } =20 - if (se->vu_socket_path) { + if (fuse_lowlevel_is_virtio(se)) { virtio_session_close(se); - free(se->vu_socket_path); - se->vu_socket_path =3D NULL; } =20 + free(se->vu_socket_path); + se->vu_socket_path =3D NULL; + free(se); } =20 --=20 2.24.1