From nobody Mon May 6 15:10:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592288811; cv=none; d=zohomail.com; s=zohoarc; b=MXQm2EHJAdVUyNV+JkpjURvOMnMQ2Wcu5zHJMiy5D2EK+cGnpWeX3Qz35kroHig9TPMy8H9m+HI7uPtGdoE0jj9TcIy75VXY0w8/TH5wBvsOdAB0/ii0IqeP/O8YEOz5bpmbXsyMzOR5IVHF9XNo/5BgrJoj4Tyz65bUO4GOBro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592288811; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=nhb+0t4hE7EoSuk1DlPz+z11MIVV9mkEwE+ry1sHAMg=; b=dZZ94J4kcSB2Pfz9TVebMA3WcKXRfvqA5Fmsugvo7oTyjUKu0BB3u6SwKXLNVNHlNlUfeF6XZL2TicR/RzYJAUD0K8rzt5abxgOQLUFc29BEjKniV5m8jcbSDTK7r00l19shks2JixVQdGYrm9bN+tHfo/XgkRhIVu3htJzKgEg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1592288811010809.2089190177895; Mon, 15 Jun 2020 23:26:51 -0700 (PDT) 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-401-NEKctOYbPtmZVCdqa0rxEA-1; Tue, 16 Jun 2020 02:26:47 -0400 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 168801883620; Tue, 16 Jun 2020 06:26:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D5C060BEC; Tue, 16 Jun 2020 06:26:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C7B3B1809547; Tue, 16 Jun 2020 06:26:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05G6QUvQ026105 for ; Tue, 16 Jun 2020 02:26:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1AD62028CD2; Tue, 16 Jun 2020 06:26:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DD7FC2026E04 for ; Tue, 16 Jun 2020 06:26:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBCA58007C8 for ; Tue, 16 Jun 2020 06:26:25 +0000 (UTC) Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-u8poUn8VO8KmpSfo-C_66Q-1; Tue, 16 Jun 2020 02:26:23 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 92485A3DB9659810224A; Tue, 16 Jun 2020 14:26:18 +0800 (CST) Received: from [127.0.0.1] (10.174.149.75) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Tue, 16 Jun 2020 14:26:15 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592288809; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nhb+0t4hE7EoSuk1DlPz+z11MIVV9mkEwE+ry1sHAMg=; b=KU5NtpMFZzLjpRcawXDwLLLPCEJ0g05/rf9QehGLWh0AB6/YvEtIzh86538dQyX8KUyomY hJBEIscniTIy+VwqJegZVAbu8C4PQ7NGZlxhHGaWL1x2z49q2AtvNlCikYOmJtBLz4yfLD xZgrW8dSlxQjXC/iK1lelOgkCUj4EDw= X-MC-Unique: NEKctOYbPtmZVCdqa0rxEA-1 X-MC-Unique: u8poUn8VO8KmpSfo-C_66Q-1 To: , , , , , , From: wangjian Subject: [PATCH] virtlogd: solve some memory leaks Message-ID: Date: Tue, 16 Jun 2020 14:26:15 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 X-Originating-IP: [10.174.149.75] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We used asan to find some memory leaks in virtlogd. In the virThreadPoolFre= e function, When job->data is of type virNetServerJobPtr, the following memory leak pro= blem exists. 1. job->data is not released Direct leak of 24 byte(s) in 1 object(s) allocated from: #0 0x7f14ab932560 in calloc (/usr/local/gcc-6-4/lib64/libasan.so.3+0xc756= 0) ??:? #1 0x55ab07088853 in virAlloc (/usr/sbin/virtlogd+0x31853) /usr/src/debu= g/libvirt-3.2.0-529.x86_64/src/util/viralloc.c:144 #2 0x55ab0707a515 (/usr/sbin/virtlogd+0x23515) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserver.c:209 #3 0x55ab07076d87 (/usr/sbin/virtlogd+0x1fd87) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverclient.c:1374 #4 0x55ab070770e2 (/usr/sbin/virtlogd+0x200e2) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverclient.c:1563 #5 0x55ab0709c67f in virEventPollRunOnce (/usr/sbin/virtlogd+0x4567f) /u= sr/src/debug/libvirt-3.2.0-529.x86_64/src/util/vireventpoll.c:508 #6 0x55ab0709ad30 in virEventRunDefaultImpl (/usr/sbin/virtlogd+0x43d30) = /usr/src/debug/libvirt-3.2.0-529.x86_64/src/util/virevent.c:314 #7 0x55ab07079f6c in virNetDaemonRun (/usr/sbin/virtlogd+0x22f6c) /usr/s= rc/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetdaemon.c:847 #8 0x55ab070714db in main (/usr/sbin/virtlogd+0x1a4db) /usr/src/debug/li= bvirt-3.2.0-529.x86_64/src/logging/log_daemon.c:1162 #9 0x7f14aa3c2c56 in __libc_start_main (/usr/lib64/libc.so.6+0x25c56) ??= :? #10 0x55ab07072639 in _start (/usr/sbin/virtlogd+0x1b639) ??:? 2. job->data->msg->buffer was not released Indirect leak of 152 byte(s) in 1 object(s) allocated from: #0 0x7f14ab932750 in realloc (/usr/local/gcc-6-4/lib64/libasan.so.3+0xc77= 50) ??:? #1 0x55ab0708894d in virReallocN (/usr/sbin/virtlogd+0x3194d) /usr/src/d= ebug/libvirt-3.2.0-529.x86_64/src/util/viralloc.c:245 #2 0x55ab0707d830 in virNetMessageDecodeLength (/usr/sbin/virtlogd+0x2683= 0) /usr/src/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetmessage.c:157 #3 0x55ab07076b36 (/usr/sbin/virtlogd+0x1fb36) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverclient.c:1269 #4 0x55ab070770e2 (/usr/sbin/virtlogd+0x200e2) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverclient.c:1563 #5 0x55ab0709c67f in virEventPollRunOnce (/usr/sbin/virtlogd+0x4567f) /u= sr/src/debug/libvirt-3.2.0-529.x86_64/src/util/vireventpoll.c:508 #6 0x55ab0709ad30 in virEventRunDefaultImpl (/usr/sbin/virtlogd+0x43d30) = /usr/src/debug/libvirt-3.2.0-529.x86_64/src/util/virevent.c:314 #7 0x55ab07079f6c in virNetDaemonRun (/usr/sbin/virtlogd+0x22f6c) /usr/s= rc/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetdaemon.c:847 #8 0x55ab070714db in main (/usr/sbin/virtlogd+0x1a4db) /usr/src/debug/li= bvirt-3.2.0-529.x86_64/src/logging/log_daemon.c:1162 #9 0x7f14aa3c2c56 in __libc_start_main (/usr/lib64/libc.so.6+0x25c56) ??= :? #10 0x55ab07072639 in _start (/usr/sbin/virtlogd+0x1b639) ??:? 3. job->data->msg was not released Indirect leak of 104 byte(s) in 1 object(s) allocated from: #0 0x7f14ab932560 in calloc (/usr/local/gcc-6-4/lib64/libasan.so.3+0xc756= 0) ??:? #1 0x55ab07088853 in virAlloc (/usr/sbin/virtlogd+0x31853) /usr/src/debu= g/libvirt-3.2.0-529.x86_64/src/util/viralloc.c:144 #2 0x55ab0707d541 in virNetMessageNew (/usr/sbin/virtlogd+0x26541) /usr/= src/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetmessage.c:42 #3 0x55ab07076618 (/usr/sbin/virtlogd+0x1f618) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverclient.c:416 #4 0x55ab0707755c in virNetServerClientNew (/usr/sbin/virtlogd+0x2055c) = /usr/src/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetserverclient.c:467 #5 0x55ab0707a9df (/usr/sbin/virtlogd+0x239df) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserver.c:319 #6 0x55ab07075ad9 (/usr/sbin/virtlogd+0x1ead9) /usr/src/debug/libvirt-3.= 2.0-529.x86_64/src/rpc/virnetserverservice.c:88 #7 0x55ab0709c67f in virEventPollRunOnce (/usr/sbin/virtlogd+0x4567f) /u= sr/src/debug/libvirt-3.2.0-529.x86_64/src/util/vireventpoll.c:508 #8 0x55ab0709ad30 in virEventRunDefaultImpl (/usr/sbin/virtlogd+0x43d30) = /usr/src/debug/libvirt-3.2.0-529.x86_64/src/util/virevent.c:314 #9 0x55ab07079f6c in virNetDaemonRun (/usr/sbin/virtlogd+0x22f6c) /usr/s= rc/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetdaemon.c:847 #10 0x55ab070714db in main (/usr/sbin/virtlogd+0x1a4db) /usr/src/debug/l= ibvirt-3.2.0-529.x86_64/src/logging/log_daemon.c:1162 #11 0x7f14aa3c2c56 in __libc_start_main (/usr/lib64/libc.so.6+0x25c56) ?= ?:? #12 0x55ab07072639 in _start (/usr/sbin/virtlogd+0x1b639) ??:? 4. job->data->prog was not released Indirect leak of 64 byte(s) in 1 object(s) allocated from: #0 0x7f14ab932560 in calloc (/usr/local/gcc-6-4/lib64/libasan.so.3+0xc756= 0) ??:? #1 0x55ab07088d34 in virAllocVar (/usr/sbin/virtlogd+0x31d34) /usr/src/d= ebug/libvirt-3.2.0-529.x86_64/src/util/viralloc.c:560 #2 0x55ab070ac45c in virObjectNew (/usr/sbin/virtlogd+0x5545c) /usr/src/= debug/libvirt-3.2.0-529.x86_64/src/util/virobject.c:200 #3 0x55ab07074f06 in virNetServerProgramNew (/usr/sbin/virtlogd+0x1df06) = /usr/src/debug/libvirt-3.2.0-529.x86_64/src/rpc/virnetserverprogram.c:80 #4 0x55ab07071432 in main (/usr/sbin/virtlogd+0x1a432) /usr/src/debug/li= bvirt-3.2.0-529.x86_64/src/logging/log_daemon.c:1131 #5 0x7f14aa3c2c56 in __libc_start_main (/usr/lib64/libc.so.6+0x25c56) ??= :? #6 0x55ab07072639 in _start (/usr/sbin/virtlogd+0x1b639) ??:? Signed-off-by: Jian wang --- src/libvirt_private.syms | 1 + src/rpc/virnetserver.c | 12 ++++++++++++ src/util/virthreadpool.c | 9 +++++++++ src/util/virthreadpool.h | 2 ++ 4 files changed, 24 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a6af44f..b23fc33 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3316,6 +3316,7 @@ virThreadPoolGetMaxWorkers; virThreadPoolGetMinWorkers; virThreadPoolGetPriorityWorkers; virThreadPoolNewFull; +virThreadPoolSetFreeFunc; virThreadPoolSendJob; virThreadPoolSetParameters; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index e0a2386..66f0fb6 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -188,6 +188,15 @@ virNetServerGetProgramLocked(virNetServerPtr srv, return NULL; } +static void virNetServerHandleFree(void *jobOpaque) +{ + virNetServerJobPtr job =3D jobOpaque; + + virObjectUnref(job->prog); + virNetMessageFree(job->msg); + VIR_FREE(job); +} + static void virNetServerDispatchNewMessage(virNetServerClientPtr client, virNetMessagePtr msg, @@ -376,6 +385,9 @@ virNetServerPtr virNetServerNew(const char *name, srv))) goto error; + if (srv->workers) + virThreadPoolSetFreeFunc(srv->workers, virNetServerHandleFree); + srv->name =3D g_strdup(name); srv->next_client_id =3D next_client_id; diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 379d236..f885c04 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -54,6 +54,7 @@ struct _virThreadPool { bool quit; virThreadPoolJobFunc jobFunc; + virThreadPoolFreeFunc freeFunc; const char *jobName; void *jobOpaque; virThreadPoolJobList jobList; @@ -271,6 +272,12 @@ virThreadPoolNewFull(size_t minWorkers, } +void virThreadPoolSetFreeFunc(virThreadPoolPtr pool, + virThreadPoolFreeFunc func) +{ + pool->freeFunc =3D func; +} + void virThreadPoolFree(virThreadPoolPtr pool) { virThreadPoolJobPtr job; @@ -293,6 +300,8 @@ void virThreadPoolFree(virThreadPoolPtr pool) while ((job =3D pool->jobList.head)) { pool->jobList.head =3D pool->jobList.head->next; + if (pool->freeFunc) + pool->freeFunc(job->data); VIR_FREE(job); } diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h index c97d9b3..d2e24f7 100644 --- a/src/util/virthreadpool.h +++ b/src/util/virthreadpool.h @@ -27,6 +27,7 @@ typedef struct _virThreadPool virThreadPool; typedef virThreadPool *virThreadPoolPtr; typedef void (*virThreadPoolJobFunc)(void *jobdata, void *opaque); +typedef void (*virThreadPoolFreeFunc)(void *jobdata); #define virThreadPoolNew(min, max, prio, func, opaque) \ virThreadPoolNewFull(min, max, prio, func, #func, opaque) @@ -46,6 +47,7 @@ size_t virThreadPoolGetFreeWorkers(virThreadPoolPtr pool); size_t virThreadPoolGetJobQueueDepth(virThreadPoolPtr pool); void virThreadPoolFree(virThreadPoolPtr pool); +void virThreadPoolSetFreeFunc(virThreadPoolPtr pool, virThreadPoolFreeFunc= func); int virThreadPoolSendJob(virThreadPoolPtr pool, unsigned int priority, --=20 2.23.0