From patchwork Thu Jan 23 11:58:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1228079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=falQbfNy; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483Pxs1DwZz9sR1 for ; Fri, 24 Jan 2020 01:37:37 +1100 (AEDT) Received: from localhost ([::1]:58198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudby-0008Uv-NW for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 09:37:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41545) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubAX-00048S-FC for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iubAR-0006Kx-EL for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26680 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iubAR-0006I8-5Z for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:00:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780858; 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=falQbfNyY9M/0p4UvQM/iILaVRJN5ExEPrLK0YDIWbcTXk4UTtGDQD2fzLKRu7wiA/+VX8 jPyym+TRcQi7QRqvhw6spR9KmbKkh4ukVTh/jg1Wnnl2+9Ih/QE/dYR/+xCric62XVXovL SWJ/u/p41heOdcrYdIRLC30V9Zi1zf4= 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-431-jzaiIdvnN16sfaoS53DV6g-1; Thu, 23 Jan 2020 07:00:54 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0510610120B0 for ; Thu, 23 Jan 2020 12:00:54 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FD9685754; Thu, 23 Jan 2020 12:00:53 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 088/111] virtiofsd: use fuse_lowlevel_is_virtio() in fuse_session_destroy() Date: Thu, 23 Jan 2020 11:58:18 +0000 Message-Id: <20200123115841.138849-89-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: jzaiIdvnN16sfaoS53DV6g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi vu_socket_path is NULL when --fd=FDNUM was used. Use fuse_lowlevel_is_virtio() instead. Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé 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_lowlevel.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); } - 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); }