From nobody Sun May 19 15:20:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1664293838; cv=none; d=zohomail.com; s=zohoarc; b=IwKQ8nWTpu/xJiuvX4JSDHxnu/z6aL+UqCWj1bGba0gonT64G95w17TmtuUUnMbWqT61/Y4XBvXw44zWN3ZQPSE1AnvplYXwLAgsQkJarLCoJBDOqOyLpRTu55RwHOP5bz/qznVaMDGiqohPIJ+us6GYGCYEg3ZO7S1QoRNvK3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664293838; 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=vv5jF9vM1R2Wn5L4vh7dMYsrvh5fdSJ50/AiLE3l50E=; b=jlYvvWDwJVEtmoqRJAdw4o2VzZzpoXyPADjClaPMn1gfH6R6Rf5R4RCSRgU5DOdR0yCwXI8QD8FUIESKZ1aSXR1VGDxzkFdxtlIMx9fGt46L67Ojrz9RJdSwZoII2MliJR+NIXY4cBhwfvun103QTfmbgXm/MrUHStUTDb//G8s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1664293838808722.1934731890419; Tue, 27 Sep 2022 08:50:38 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-xhaXz_iwO4y3-8rn0_7wvQ-1; Tue, 27 Sep 2022 11:50:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4B491C08973; Tue, 27 Sep 2022 15:50:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68475112131E; Tue, 27 Sep 2022 15:50:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DA0081946A47; Tue, 27 Sep 2022 15:50:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A141E1946A45 for ; Tue, 27 Sep 2022 15:50:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 71A65C15BAB; Tue, 27 Sep 2022 15:50:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A665C15BA8 for ; Tue, 27 Sep 2022 15:50:19 +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-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E524101CC62 for ; Tue, 27 Sep 2022 15:50:19 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-498-MdtA-cZKOX-oHqPGs3Ojfw-1; Tue, 27 Sep 2022 11:50:17 -0400 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4McPBq2Fy2zpTDd for ; Tue, 27 Sep 2022 23:47:15 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 23:50:10 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664293837; 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=vv5jF9vM1R2Wn5L4vh7dMYsrvh5fdSJ50/AiLE3l50E=; b=MmVztgE1stSnwLtPcsZIHGcq89KxYKDoWc0idNWIGTM3FLvqPYh0/IeQSzZWwYOKGfGp3L fabMaYNV2TlTtxXwygytoUOA4w2aK4ykmGf0M8Qlxi5lbkR0SO+U2/RUNNsxyhDQ9TKwvN PkCNwaww2WpbSgzGWb5yteuUWrO9ZdM= X-MC-Unique: xhaXz_iwO4y3-8rn0_7wvQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: MdtA-cZKOX-oHqPGs3Ojfw-1 From: Jiang Jiacheng To: Subject: [PATCH v2] rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall Date: Tue, 27 Sep 2022 23:38:21 +0800 Message-ID: <20220927153821.461930-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664293841149100001 Content-Type: text/plain; charset="utf-8" From: jiangjiacheng In virNetServerProgramDispatchCall, The arg is passed as a void* and used t= o point to a certain struct depended on the dispatcher, so I think it's the memory = of the struct's member that leaks and this memory shuld be freed by xdr_free. In virNetServerClientNew, client->rx is assigned by invoking virNetServerCl= ientNew, but isn't freed if client->privateData's initialization failed, which leads= to a memory leak. Thanks to Liang Peng's suggestion, put virNetMessageFree(clien= t->rx) into virNetServerClientDispose() to release the memory. Signed-off-by: jiangjiacheng --- src/rpc/virnetserverclient.c | 2 ++ src/rpc/virnetserverprogram.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index a7d2dfa795..30f6af7be5 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -931,6 +931,8 @@ void virNetServerClientDispose(void *obj) PROBE(RPC_SERVER_CLIENT_DISPOSE, "client=3D%p", client); =20 + if (client->rx) + virNetMessageFree(client->rx); if (client->privateData) client->privateDataFreeFunc(client->privateData); =20 diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 3ddf9f0428..a813e821a3 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -409,11 +409,15 @@ virNetServerProgramDispatchCall(virNetServerProgram *= prog, if (virNetMessageDecodePayload(msg, dispatcher->arg_filter, arg) < 0) goto error; =20 - if (!(identity =3D virNetServerClientGetIdentity(client))) + if (!(identity =3D virNetServerClientGetIdentity(client))) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } =20 - if (virIdentitySetCurrent(identity) < 0) + if (virIdentitySetCurrent(identity) < 0) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } =20 /* * When the RPC handler is called: @@ -427,8 +431,10 @@ virNetServerProgramDispatchCall(virNetServerProgram *p= rog, */ rv =3D (dispatcher->func)(server, client, msg, &rerr, arg, ret); =20 - if (virIdentitySetCurrent(NULL) < 0) + if (virIdentitySetCurrent(NULL) < 0) { + xdr_free(dispatcher->arg_filter, arg); goto error; + } =20 /* * If rv =3D=3D 1, this indicates the dispatch func has --=20 2.27.0