From nobody Fri May 3 01:21:55 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1574835715; cv=none; d=zohomail.com; s=zohoarc; b=dws+LUKntyfsHooGINaAjKpCZD0f4ykAqlP6ru9tLrU7ENcRlYmkA1N4leEYnTeYgaylfdL5QtrkiUBDUeqnkE3X2YRvymzHpkjWUQD3sX+TV50zmNQIUGzDEBQ1oyvX+BwS+uzGZiaRYylTsj5eBstPEMTjq8KZv8LQKf2MmBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574835715; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9VQ4I5DN4/1W3JV1aO5HPajs/XWL569tliCHHpi2Zvw=; b=DMF0Qja4UER4XLwaUbFFoP96JJ29LMRiwM2I2tGC+YEbu7ozP/Y5Op3/eMDgHGIV9ffPk7HMh6aaiw2f7o3f6JuvPdoaYwxvFPCuYNbF6qP5A2JQ+scS5JwRtukMc4Dpygc4ayVgepqUGYqDgt60yhbKLyaBvK4DpOXRxLULGLM= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574835715163172.15728440985754; Tue, 26 Nov 2019 22:21:55 -0800 (PST) Received: from localhost ([::1]:33352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZqi1-00065B-6R for importer@patchew.org; Wed, 27 Nov 2019 01:21:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46454) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZqhA-0005Zr-1E for qemu-devel@nongnu.org; Wed, 27 Nov 2019 01:21:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZqh8-0004tN-RG for qemu-devel@nongnu.org; Wed, 27 Nov 2019 01:20:59 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:45104 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZqh5-0004op-4F; Wed, 27 Nov 2019 01:20:55 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id CF1D7E05169AE6BD05E6; Wed, 27 Nov 2019 14:20:49 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Wed, 27 Nov 2019 14:20:41 +0800 From: To: , , Subject: [PATCH V2] throttle-groups: fix memory leak in throttle_group_set_limit: Date: Wed, 27 Nov 2019 14:20:14 +0800 Message-ID: <1574835614-42028-1-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 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: liyiting@huawei.com, zhang.zhanghailiang@huawei.com, qemu-block@nongnu.org, PanNengyuan , qemu-devel@nongnu.org, kuhn.chenqun@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: PanNengyuan This avoid a memory leak when qom-set is called to set throttle_group limits, here is an easy way to reproduce: 1. run qemu-iotests as follow and check the result with asan: ./check -qcow2 184 Following is the asan output backtrack: Direct leak of 912 byte(s) in 3 object(s) allocated from: #0 0xffff8d7ab3c3 in __interceptor_calloc (/lib64/libasan.so.4+0xd33c= 3) #1 0xffff8d4c31cb in g_malloc0 (/lib64/libglib-2.0.so.0+0x571cb) #2 0x190c857 in qobject_input_start_struct /mnt/sdc/qemu-master/qemu-4= .2.0-rc0/qapi/qobject-input-visitor.c:295 #3 0x19070df in visit_start_struct /mnt/sdc/qemu-master/qemu-4.2.0-rc= 0/qapi/qapi-visit-core.c:49 #4 0x1948b87 in visit_type_ThrottleLimits qapi/qapi-visit-block-core.= c:3759 #5 0x17e4aa3 in throttle_group_set_limits /mnt/sdc/qemu-master/qemu-4= .2.0-rc0/block/throttle-groups.c:900 #6 0x1650eff in object_property_set /mnt/sdc/qemu-master/qemu-4.2.0= -rc0/qom/object.c:1272 #7 0x1658517 in object_property_set_qobject /mnt/sdc/qemu-master/qemu= -4.2.0-rc0/qom/qom-qobject.c:26 #8 0x15880bb in qmp_qom_set /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qo= m-qmp-cmds.c:74 #9 0x157e3e3 in qmp_marshal_qom_set qapi/qapi-commands-qom.c:154 Reported-by: Euler Robot Signed-off-by: PanNengyuan --- Changes v2 to v1: - remove unused var 'arg' (suggested by Alberto Garcia) --- block/throttle-groups.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/throttle-groups.c b/block/throttle-groups.c index 77014c7..37695b0 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -893,8 +893,7 @@ static void throttle_group_set_limits(Object *obj, Visi= tor *v, { ThrottleGroup *tg =3D THROTTLE_GROUP(obj); ThrottleConfig cfg; - ThrottleLimits arg =3D { 0 }; - ThrottleLimits *argp =3D &arg; + ThrottleLimits *argp; Error *local_err =3D NULL; =20 visit_type_ThrottleLimits(v, name, &argp, &local_err); @@ -912,6 +911,7 @@ static void throttle_group_set_limits(Object *obj, Visi= tor *v, unlock: qemu_mutex_unlock(&tg->lock); ret: + qapi_free_ThrottleLimits(argp); error_propagate(errp, local_err); return; } --=20 2.7.2.windows.1