From nobody Tue Feb 10 00:00:53 2026 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=1576172042; cv=none; d=zohomail.com; s=zohoarc; b=OASYc6y/XnMdsgI/8N5Kfkv5Xx9dFYwymkUrqgbbdlZB5+R/yjBz/RIUz4HkMHecACRE+LwmTQ+qkwUZbf/ZVGUb5cfLAcnwYh1VOlVgiUJtkzig0bBmEt2k/XXk6xEFpigPKd4F6JVvFf3yrZbop9IPGGIEfeLfdjyk3SQAWFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576172042; 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=I6L7bMqv9tF9btHFzArvoc0R26mYOdLRdKMB1+xZzDM=; b=fcf+6YsfFGuN1cLyaS9+Wl5rGQMIODfy/z+zGbsgXtJyX9wh7mRV7wsNNOO2met4qk48bJJhpPjHW2ragBkcbmZdlf9Yud5XHHl7u3S7Si/VMmQsSl2+LQatleCRWSp+DA3IPunKCiGpDhLJQBX2lgxKd6qW6ZwymyjwpCi4gc4= 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 1576172042562969.0086884678444; Thu, 12 Dec 2019 09:34:02 -0800 (PST) Received: from localhost ([::1]:34734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifSLg-0001r7-K7 for importer@patchew.org; Thu, 12 Dec 2019 12:34:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34459) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifRWp-0007Rf-GD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:41:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifRWo-0004Mp-61 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:41:27 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32535 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 1ifRWo-0004Lu-2A for qemu-devel@nongnu.org; Thu, 12 Dec 2019 11:41:26 -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-257-rPBSlcRVOP66gOowEM7bZw-1; Thu, 12 Dec 2019 11:41:24 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F4868024CF for ; Thu, 12 Dec 2019 16:41:23 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-226.ams2.redhat.com [10.36.116.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6484160BE1; Thu, 12 Dec 2019 16:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576168885; 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=I6L7bMqv9tF9btHFzArvoc0R26mYOdLRdKMB1+xZzDM=; b=RlshWapJl4R2x4GNX3kuVKzqa/WMi4Xu2O8KEJ0x0l3e3LFHp3ce1wueyGJosJd5yvOuWC aWVVbbGaKe/1D56UBMDGiBcy7meNb/AzRdXQhVpjqSU2OPC/u6okHpJLD3N31BLTHVvjBB kG00fyaMMV5A96A7yHViW3P/qi4xyXo= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com Subject: [PATCH 084/104] Virtiofsd: fix memory leak on fuse queueinfo Date: Thu, 12 Dec 2019 16:38:44 +0000 Message-Id: <20191212163904.159893-85-dgilbert@redhat.com> In-Reply-To: <20191212163904.159893-1-dgilbert@redhat.com> References: <20191212163904.159893-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: rPBSlcRVOP66gOowEM7bZw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Liu Bo For fuse's queueinfo, both queueinfo array and queueinfos are allocated in fv_queue_set_started() but not cleaned up when the daemon process quits. This fixes the leak in proper places. Signed-off-by: Liu Bo Signed-off-by: Eric Ren --- tools/virtiofsd/fuse_virtio.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 7b22ae8d4f..a364f23d5d 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -671,6 +671,8 @@ static void fv_queue_set_started(VuDev *dev, int qidx, = bool started) } close(ourqi->kill_fd); ourqi->kick_fd =3D -1; + free(vud->qi[qidx]); + vud->qi[qidx] =3D NULL; } } =20 @@ -878,6 +880,13 @@ int virtio_session_mount(struct fuse_session *se) void virtio_session_close(struct fuse_session *se) { close(se->vu_socketfd); + + if (!se->virtio_dev) { + return; + } + + close(se->vu_socketfd); + free(se->virtio_dev->qi); free(se->virtio_dev); se->virtio_dev =3D NULL; } --=20 2.23.0