From nobody Mon Feb 9 02:14:40 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=1579615369; cv=none; d=zohomail.com; s=zohoarc; b=gAidvy6M6wpRws36RWRfH0SFWkEqoDPXecFLRUqOtAQNH8IS/EqRX7U6pb9ts8WTFOsbu19yacjWBOC1arrBfqeHPKLVuSHjUdPd4q2o/l65T5hMoKARHKF20Q7x5Q9JN6TXKeH3w2FUPPBo96AHs2Wh3kFos1uabmeq1pyS4YQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579615369; h=Content-Type:Content-Transfer-Encoding:Cc: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=EelNPo7oaGzq9Vcc5rnMRqCAK39taXFuie982T6uv/Q=; b=nXkWuNluKoAxjXFLXrZEKTxVWV89lhGeIfbTinv9HSXiZd0TniaADca9JftnFTi+wi06WvN+ibs2EXSeKGHNPyZ+HBTW4d+N2P4XrtmnlId1UpOM42iDS0K8zYKko1PPSUb1JynVYaIKhXEHGInCpgMgH4amTeBy9kEdC0wG+CU= 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 1579615369962931.8501913832563; Tue, 21 Jan 2020 06:02:49 -0800 (PST) Received: from localhost ([::1]:54540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itu7D-000416-Qg for importer@patchew.org; Tue, 21 Jan 2020 09:02:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52655) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itshC-0002za-TV for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itsh8-0004eO-JK for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:50 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44955 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 1itsh8-0004eG-FZ for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:46 -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-314-CKIU2QMnNv2or-ScyywIRg-1; Tue, 21 Jan 2020 07:31:44 -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 697531083E81; Tue, 21 Jan 2020 12:31:43 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B82060BE0; Tue, 21 Jan 2020 12:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579609906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EelNPo7oaGzq9Vcc5rnMRqCAK39taXFuie982T6uv/Q=; b=VoeCqGp1C5UFFgFDCCeQqPeT/Gv+tqISpTX7sQXli4HTAjh7nZIRfzLaCFmPLIm0sDqjgY EqKQBTE14Cp6BvYNUvnk2nmToF788WKqP+0f4rSBUML7OQdaS5SoCm8OkdqLgjWMwJZp3U Z8Tixt+KD9M6+fBSutoTGdf7no36wSQ= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, berrange@redhat.com, slp@redhat.com, philmd@redhat.com Subject: [PATCH v2 085/109] Virtiofsd: fix memory leak on fuse queueinfo Date: Tue, 21 Jan 2020 12:24:09 +0000 Message-Id: <20200121122433.50803-86-dgilbert@redhat.com> In-Reply-To: <20200121122433.50803-1-dgilbert@redhat.com> References: <20200121122433.50803-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: CKIU2QMnNv2or-ScyywIRg-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] [fuzzy] X-Received-From: 205.139.110.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: , Cc: m.mizuma@jp.fujitsu.com, misono.tomohiro@jp.fujitsu.com 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 Reviewed-by: Misono Tomohiro --- tools/virtiofsd/fuse_virtio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index b7948def27..fb8d6d1379 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -625,6 +625,8 @@ static void fv_queue_cleanup_thread(struct fv_VuDev *vu= d, int qidx) } close(ourqi->kill_fd); ourqi->kick_fd =3D -1; + free(vud->qi[qidx]); + vud->qi[qidx] =3D NULL; } =20 /* Callback from libvhost-user on start or stop of a queue */ @@ -884,6 +886,12 @@ 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; + } + + free(se->virtio_dev->qi); free(se->virtio_dev); se->virtio_dev =3D NULL; } --=20 2.24.1