From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 618DFC433DB for ; Mon, 28 Dec 2020 07:01:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC807207D0 for ; Mon, 28 Dec 2020 07:01:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC807207D0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktmWp-00027n-Vp for qemu-devel@archiver.kernel.org; Mon, 28 Dec 2020 02:01:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktmUo-0000e1-SV; Mon, 28 Dec 2020 01:59:10 -0500 Received: from ozlabs.org ([203.11.71.1]:34251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktmUl-0003qJ-Sz; Mon, 28 Dec 2020 01:59:10 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4D47gg4v6kz9sWb; Mon, 28 Dec 2020 17:58:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1609138735; bh=rIV/2XZN2IQOlRKINGhJQUJVhqy9+ixInWkD6Hk+kiw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QarZM2bslZUOpuL6OnmAV5Hg777/91w7beCCpovpyUEabMd8l7JcHW9iClEPXZ7xz O05zWQrei6/O1CXjx1wp9lM2ZBiZFMf5YYcwtdn/FtaqW/JcFaV48YCfz4mEm5h1Kd gDe18CwGggugTPCUb8FvFowBiH0UtaaMQ3de1yk0= Date: Mon, 28 Dec 2020 17:56:35 +1100 From: David Gibson To: g00517791 Subject: Re: [PATCH 3/8] spapr: Fix memory leak of vmstate_spapr_event_entry Message-ID: <20201228065635.GA6952@yekko.fritz.box> References: <20201226103347.868-1-gaojinhao@huawei.com> <20201226103347.868-4-gaojinhao@huawei.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ew6BAiZeqk4r7MaW" Content-Disposition: inline In-Reply-To: <20201226103347.868-4-gaojinhao@huawei.com> Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: "Michael S . Tsirkin" , Jason Wang , Stefan Berger , qemu-devel@nongnu.org, Greg Kurz , Juan Quintela , qemu-ppc@nongnu.org, wanghaibin.wang@huawei.com, =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , zhukeqian1@huawei.com, "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --ew6BAiZeqk4r7MaW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 26, 2020 at 06:33:42PM +0800, g00517791 wrote: > From: Jinhao Gao >=20 > When VM migrate VMState of spapr_event_log_entry, the field(extended_log) > of spapr_event_log_entry having a flag of VMS_ALLOC needs to allocate > memory. If the dst doesn't free memory which has been allocated for > SaveStateEntry of spapr_event_log_entry before dst loads device state, > it may result that the pointer of extended_log is overlaid when vm loads. > We add the pre_load func to free memory, which prevents memory leak. >=20 > Signed-off-by: Jinhao Gao Acked-by: David Gibson > --- > hw/ppc/spapr.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 489cefcb81..ddfed1e7ca 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1799,10 +1799,22 @@ static bool spapr_pending_events_needed(void *opa= que) > return !QTAILQ_EMPTY(&spapr->pending_events); > } > =20 > +static int spapr_event_log_entry_pre_load(void *opaque) > +{ > + SpaprEventLogEntry *entry =3D opaque; > + > + g_free(entry->extended_log); > + entry->extended_log =3D NULL; > + entry->extended_length =3D 0; > + > + return 0; > +} > + > static const VMStateDescription vmstate_spapr_event_entry =3D { > .name =3D "spapr_event_log_entry", > .version_id =3D 1, > .minimum_version_id =3D 1, > + .pre_load =3D spapr_event_log_entry_pre_load, > .fields =3D (VMStateField[]) { > VMSTATE_UINT32(summary, SpaprEventLogEntry), > VMSTATE_UINT32(extended_length, SpaprEventLogEntry), --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --ew6BAiZeqk4r7MaW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl/pgaEACgkQbDjKyiDZ s5IZdRAAoqLIlV2q8aTwf7ZEkGTkMA8ePF+9hULBI4k7irlEQt3qlr2oNhJkGak+ hFBQXC+xdPg8wh0pxxwKkjGNABKWh8SiSZMPNz8SccTQ91sgs8E7yXm0/4GY9SsH cuoczhaUqs/4YHbpL0L8pgmZTUnqDwLqMhT1td7e2Rj0GVfiqhRDx9wZwCibamMz bAXIQg5Wcgq7Iem4OM2FWU6KrC9NBkM+25DzxwQXAn3A+m0ERHsAbanzBOh+9Q8k vRqTnPR6D9jl7eYBiAjDM1t0hi9YC8kel2TCLUtsdEVY3lWUOxAYYwptSaLDktRy O70zPu4iFgdBd+ALnbw3phkMct6U4k2c5balkR9SmfQukR0VdzQfKwJEyjtVQwUG 3qAuHfwqhoiIo/OiymPGYu9eZTGhyL972eqMFzKicWGk6AM368zaVo5cfLfKnYbm qWhF5qWh7iBRKmtklFLZgmwacSZUncfxV7VBGWpvI+toM2zOZa8Nn6HYnPy9kTfT gfYADTI8C1pRoxF4kyNagyis7xpnrfT6zGeO8yLunx6wBwZW4oGGHKbIpgPEBRUE BCUdCOU+YN9wofQ2TmOeH5l867TDqTGHGePvP8CB93gX8sMyGA3xnmzn/56576NJ /rgDKCxQNd4wZG/e1wvNPmSoCiX7liK53UG26zCUglWCzk2+dqI= =5nUm -----END PGP SIGNATURE----- --ew6BAiZeqk4r7MaW--