From nobody Thu Nov 28 08:35:16 2024 Delivered-To: importer@patchew.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; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1693834162; cv=none; d=zohomail.com; s=zohoarc; b=kDr0AkLnYer3l0hy4AgcXEnDWKCRL3JEY6GedPme3kIB6oC3PGjCXhkWohnkQ9Ixh++PKCby07sntbL38q7H4PX8GTCquFi4Jqpgop+j3bTlKu1pAek0NyHCIp8ijOAGjE7Ze9ajmjwLUDJvJEwsU5pz8giquOovnm76kxrmO24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693834162; 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:Reply-To:References:Sender:Subject:To; bh=6cyIj1BQXKbk0+MDBLJ8n//eKpkW4aqxIuGsWDWTBx8=; b=NhtJvbG5YTRNxQP5iT0GWDTRc1ctf/PAUeTAq90Gqja8NQ+tYt0BLrCl1QiJ2i2MftrNsJ4J0r2kW/DCUx3nwOWx2XN/JQ8HTqvqNVqqK92QUjmzRzMzpj5fFdapfg6EawVRJKej+bYxuXPHXQHKzi3nnHmNriAFyy++o+WOELA= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693834162084645.5852000173633; Mon, 4 Sep 2023 06:29:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd9dS-0006qP-4l; Mon, 04 Sep 2023 09:28:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd9dD-0006lf-8a for qemu-devel@nongnu.org; Mon, 04 Sep 2023 09:28:44 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd9d9-0000xQ-Ue for qemu-devel@nongnu.org; Mon, 04 Sep 2023 09:28:42 -0400 Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4RfTqv6skKz67l04; Mon, 4 Sep 2023 21:24:11 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Mon, 4 Sep 2023 14:28:37 +0100 To: , Michael Tsirkin , Fan Ni , CC: Li Zhijian , Dave Jiang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Subject: [PATCH 1/4] hw/cxl: Fix CFMW config memory leak Date: Mon, 4 Sep 2023 14:28:03 +0100 Message-ID: <20230904132806.6094-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230904132806.6094-1-Jonathan.Cameron@huawei.com> References: <20230904132806.6094-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml500001.china.huawei.com (7.191.163.213) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected 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; Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1693834164078100007 From: Li Zhijian Allocate targets and targets[n] resources when all sanity checks are passed to avoid memory leaks. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Li Zhijian Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Jonathan Cameron Reviewed-by: Fan Ni --- hw/cxl/cxl-host.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 034c7805b3..f0920da956 100644 --- a/hw/cxl/cxl-host.c +++ b/hw/cxl/cxl-host.c @@ -39,12 +39,6 @@ static void cxl_fixed_memory_window_config(CXLState *cxl= _state, return; } =20 - fw->targets =3D g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); - for (i =3D 0, target =3D object->targets; target; i++, target =3D targ= et->next) { - /* This link cannot be resolved yet, so stash the name for now */ - fw->targets[i] =3D g_strdup(target->value); - } - if (object->size % (256 * MiB)) { error_setg(errp, "Size of a CXL fixed memory window must be a multiple o= f 256MiB"); @@ -64,6 +58,12 @@ static void cxl_fixed_memory_window_config(CXLState *cxl= _state, fw->enc_int_gran =3D 0; } =20 + fw->targets =3D g_malloc0_n(fw->num_targets, sizeof(*fw->targets)); + for (i =3D 0, target =3D object->targets; target; i++, target =3D targ= et->next) { + /* This link cannot be resolved yet, so stash the name for now */ + fw->targets[i] =3D g_strdup(target->value); + } + cxl_state->fixed_windows =3D g_list_append(cxl_state->fixed_windows, g_steal_pointer(&fw)); =20 --=20 2.39.2