From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp1880427lfb; Fri, 3 Sep 2021 20:22:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtyQXt86v1Wfs3xhSGUF/PeQOtYCh7h9gCwu9b+GXAvfFg60ilUcSXbbeKlovSXBl4OahY X-Received: by 2002:a65:5a81:: with SMTP id c1mr1879180pgt.74.1630725770041; Fri, 03 Sep 2021 20:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630725770; cv=none; d=google.com; s=arc-20160816; b=w0xdwXPmyEl6KjkXVu0Uun53ERsd+y5qT3Y0dJr5B0E9rQ7U3lww+oLm15YGfGKAap aWc7LE8Y8kCpvUnywJJWbZRkzvtMp+PcVU01OjGXoUNtIzfg9n/bQbRsp+yp6ZMR/NZS zhK62fXMtJlYiZodvQT5SFqjL7tEoocJ4WJn6qI28bVvWxOvPMeH2TH5GRnJDdHXSzGb YNyxWpiFMnKNo2OQ2nRx5t8Uo5De0Kb37RLeMSpDMPPAIpChxXKw6z8vtRjOV84M9XC2 g2i3A+MwIFo2anKi6voOPQbsyNp8U8KQ1PGd+GqEpYBrMckzVSAFsKGSHCgAM/89dod9 yVdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:dkim-signature; bh=4H3eQ3QsA05/VW7kGkCpNxug8epEW37imp3Hj13ukA0=; b=ei/3TYYN9dt+RuSO8mVL3oexucFuHyqoO2/qd5nhOOD01qC+EoRw+8FN5qmOTb+YvU 2vxB4h314vVg89kuzPXVLUPI/Wp+Mzl1/kMEtb0U+H59GEC8434sb3Ljl+mtHGj6qjyQ deTOJbz8qEjyzsxLGvn3NCAnnf4YWepu37+BGN3nNxJ+P0dc0jRr+BKRLZB6M2kBHOQu +PL63vT9u+yRBRFLB70TbWjXnuP2Vit20JGejI3LmWgHl8WZHH2YGdXrSSSJGNgNrtso v3nUVN+JLg2pi53f2gmnYmKzRIcvjUuAz3hTkTIbfTGN1a7HuMFZK0ZI/mb1DY7V1Bs0 csQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gibson.dropbear.id.au header.s=201602 header.b=FhKBtH09; spf=pass (google.com: domain of dgibson@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) smtp.mailfrom=dgibson@ozlabs.org Return-Path: Received: from ozlabs.org (bilbo.ozlabs.org. [2401:3900:2:1::2]) by mx.google.com with ESMTPS id v135si1033281pgb.632.2021.09.03.20.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 20:22:50 -0700 (PDT) Received-SPF: pass (google.com: domain of dgibson@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) client-ip=2401:3900:2:1::2; Authentication-Results: mx.google.com; dkim=pass header.i=@gibson.dropbear.id.au header.s=201602 header.b=FhKBtH09; spf=pass (google.com: domain of dgibson@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) smtp.mailfrom=dgibson@ozlabs.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1630725765; bh=4H3eQ3QsA05/VW7kGkCpNxug8epEW37imp3Hj13ukA0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FhKBtH09mz70UpeBBQN1+nw0AkeP2Z7ZfguDZhFy+fXhUB93xK0BBaLDHnG+tah+Z oY61PGYG7PqAiiZjPDD1zSCBoefNvzdGgGHNE8EbWB2Pwhq3DGTECIbY9rzGEtOeX2 8xjKK2rV7xNBW5LiVqh5EADK6/XaYMdqvUNmbe5E= Received: by ozlabs.org (Postfix, from userid 1007) id 4H1g2s4S8bz9sVq; Sat, 4 Sep 2021 13:22:45 +1000 (AEST) Date: Fri, 3 Sep 2021 21:45:05 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, Hanna Reitz , Igor Mammedov , Laurent Vivier , Alexandre Iooss , Alex =?iso-8859-1?Q?Benn=E9e?= , Michael Roth , Zhang Chen , Shannon Zhao , Richard Henderson , Alex Williamson , Eduardo Habkost , Markus Armbruster , Eric Blake , Stefan Weil , John Snow , Mahmoud Mandour , Li Zhijian , Marcel Apfelbaum , qemu-block@nongnu.org, Helge Deller , "Michael S. Tsirkin" , Peter Xu , "Gonglei (Arei)" , Gerd Hoffmann , Fam Zheng , Jason Wang , Vladimir Sementsov-Ogievskiy , Christian Schoenebeck , Kevin Wolf , Yuval Shaia , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Thomas Huth , Laurent Vivier , Greg Kurz , qemu-ppc@nongnu.org, David Hildenbrand Subject: Re: [PATCH 16/28] hw/ppc/spapr_pci: Replace g_memdup() by g_memdup2_qemu() Message-ID: References: <20210903110702.588291-1-philmd@redhat.com> <20210903110702.588291-17-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="467AKG5kT2VkpE+f" Content-Disposition: inline In-Reply-To: <20210903110702.588291-17-philmd@redhat.com> X-TUID: BHuLMI8Fu1h8 --467AKG5kT2VkpE+f Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 03, 2021 at 01:06:50PM +0200, Philippe Mathieu-Daud=E9 wrote: > Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-mem= dup2-now/5538 >=20 > The old API took the size of the memory to duplicate as a guint, > whereas most memory functions take memory sizes as a gsize. This > made it easy to accidentally pass a gsize to g_memdup(). For large > values, that would lead to a silent truncation of the size from 64 > to 32 bits, and result in a heap area being returned which is > significantly smaller than what the caller expects. This can likely > be exploited in various modules to cause a heap buffer overflow. >=20 > Replace g_memdup() by the safer g_memdup2_qemu() wrapper. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 Acked-by: David Gibson > --- > hw/ppc/spapr_pci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 7430bd63142..79c0e8d4f98 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -2201,10 +2201,10 @@ static int spapr_pci_post_load(void *opaque, int = version_id) > int i; > =20 > for (i =3D 0; i < sphb->msi_devs_num; ++i) { > - key =3D g_memdup(&sphb->msi_devs[i].key, > - sizeof(sphb->msi_devs[i].key)); > - value =3D g_memdup(&sphb->msi_devs[i].value, > - sizeof(sphb->msi_devs[i].value)); > + key =3D g_memdup2_qemu(&sphb->msi_devs[i].key, > + sizeof(sphb->msi_devs[i].key)); > + value =3D g_memdup2_qemu(&sphb->msi_devs[i].value, > + sizeof(sphb->msi_devs[i].value)); > g_hash_table_insert(sphb->msi, key, value); > } > g_free(sphb->msi_devs); --=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 --467AKG5kT2VkpE+f Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmEyCr4ACgkQbDjKyiDZ s5JQMw/9EgSrnPgRxc/R/Ui5DGXjZmF6ieBr0Sb+CICEvlJ0c0wOsuBLwkRfg2kN OLr/Mj6S4Klz91l4pGDCJBkqsivYnCLg8rMoCISZu/o30Y6bH4r1jx6qfySVadzn GpgRhEMqBTMBnhBqXslGjecD886ICIGxmZhYTN0RQjD2RPTfwlk7fesfUQKuh4O/ wjpfLY94qUnO6nqo2lsR8N3k082bsUO1EniGpZ1xAk4i06NlLSaukLJ3AR+4YrJ0 c7d58BZA3i2RZFDnFYuQU7vYoS5Amop9wVgCOTcLGwwo7NChLY73G/RZnUNTbdz/ tVz8gEiRCkiotfF4r4dRwycDKzjm07h0uXvCFYSwzDGhKt7AitioLXi0HKp/e/OV Jci9uYLHgjCRRPYzzb5ly9YW9Laa0HECAYCc5WHoOCigEquEKXvWKQJdQd1PQ/Xx OUaLzfGnCB+WEzJho3BnLaD7KkEMlg6hk6zKF0l+WcS/Tl/pUQKM2k96dU6QlWtV kpMVMDJfoQDb7Og9QZZ0yxd28sYNObIfzUkfsIV4klpEToEtyUZC+JL+CQN3XDbK 94bDR4KvU2ziw8LeDsxoi0UxcvZjOqtRbNLnI3wS4oOAdif6iDVnWzfbU902AWI0 ojeJ7aZC98t3T0hVtyyC3B5aB6ADWKaIkizvmFtqz+hjCa/l/Lw= =3mpO -----END PGP SIGNATURE----- --467AKG5kT2VkpE+f-- 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=-12.5 required=3.0 tests=BAYES_00,DATE_IN_PAST_12_24, 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 AD13EC433F5 for ; Sat, 4 Sep 2021 03:27:57 +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 3EFC460E93 for ; Sat, 4 Sep 2021 03:27:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3EFC460E93 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=nongnu.org Received: from localhost ([::1]:47762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMMLU-0000v0-9q for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 23:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMMGk-0006Kc-GZ; Fri, 03 Sep 2021 23:23:02 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:35283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMMGh-0005EC-6V; Fri, 03 Sep 2021 23:23:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1630725765; bh=4H3eQ3QsA05/VW7kGkCpNxug8epEW37imp3Hj13ukA0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FhKBtH09mz70UpeBBQN1+nw0AkeP2Z7ZfguDZhFy+fXhUB93xK0BBaLDHnG+tah+Z oY61PGYG7PqAiiZjPDD1zSCBoefNvzdGgGHNE8EbWB2Pwhq3DGTECIbY9rzGEtOeX2 8xjKK2rV7xNBW5LiVqh5EADK6/XaYMdqvUNmbe5E= Received: by ozlabs.org (Postfix, from userid 1007) id 4H1g2s4S8bz9sVq; Sat, 4 Sep 2021 13:22:45 +1000 (AEST) Date: Fri, 3 Sep 2021 21:45:05 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH 16/28] hw/ppc/spapr_pci: Replace g_memdup() by g_memdup2_qemu() Message-ID: References: <20210903110702.588291-1-philmd@redhat.com> <20210903110702.588291-17-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="467AKG5kT2VkpE+f" Content-Disposition: inline In-Reply-To: <20210903110702.588291-17-philmd@redhat.com> Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: Fam Zheng , Peter Maydell , Li Zhijian , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , qemu-devel@nongnu.org, Peter Xu , Gerd Hoffmann , Alexandre Iooss , Eric Blake , qemu-block@nongnu.org, Zhang Chen , Alex =?iso-8859-1?Q?Benn=E9e?= , Helge Deller , David Hildenbrand , Markus Armbruster , "Gonglei \(Arei\)" , Stefan Weil , Laurent Vivier , Thomas Huth , Eduardo Habkost , Michael Roth , Richard Henderson , Greg Kurz , Yuval Shaia , Alex Williamson , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Shannon Zhao , Hanna Reitz , qemu-ppc@nongnu.org, Igor Mammedov , Mahmoud Mandour Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --467AKG5kT2VkpE+f Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 03, 2021 at 01:06:50PM +0200, Philippe Mathieu-Daud=E9 wrote: > Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-mem= dup2-now/5538 >=20 > The old API took the size of the memory to duplicate as a guint, > whereas most memory functions take memory sizes as a gsize. This > made it easy to accidentally pass a gsize to g_memdup(). For large > values, that would lead to a silent truncation of the size from 64 > to 32 bits, and result in a heap area being returned which is > significantly smaller than what the caller expects. This can likely > be exploited in various modules to cause a heap buffer overflow. >=20 > Replace g_memdup() by the safer g_memdup2_qemu() wrapper. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 Acked-by: David Gibson > --- > hw/ppc/spapr_pci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 7430bd63142..79c0e8d4f98 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -2201,10 +2201,10 @@ static int spapr_pci_post_load(void *opaque, int = version_id) > int i; > =20 > for (i =3D 0; i < sphb->msi_devs_num; ++i) { > - key =3D g_memdup(&sphb->msi_devs[i].key, > - sizeof(sphb->msi_devs[i].key)); > - value =3D g_memdup(&sphb->msi_devs[i].value, > - sizeof(sphb->msi_devs[i].value)); > + key =3D g_memdup2_qemu(&sphb->msi_devs[i].key, > + sizeof(sphb->msi_devs[i].key)); > + value =3D g_memdup2_qemu(&sphb->msi_devs[i].value, > + sizeof(sphb->msi_devs[i].value)); > g_hash_table_insert(sphb->msi, key, value); > } > g_free(sphb->msi_devs); --=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 --467AKG5kT2VkpE+f Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmEyCr4ACgkQbDjKyiDZ s5JQMw/9EgSrnPgRxc/R/Ui5DGXjZmF6ieBr0Sb+CICEvlJ0c0wOsuBLwkRfg2kN OLr/Mj6S4Klz91l4pGDCJBkqsivYnCLg8rMoCISZu/o30Y6bH4r1jx6qfySVadzn GpgRhEMqBTMBnhBqXslGjecD886ICIGxmZhYTN0RQjD2RPTfwlk7fesfUQKuh4O/ wjpfLY94qUnO6nqo2lsR8N3k082bsUO1EniGpZ1xAk4i06NlLSaukLJ3AR+4YrJ0 c7d58BZA3i2RZFDnFYuQU7vYoS5Amop9wVgCOTcLGwwo7NChLY73G/RZnUNTbdz/ tVz8gEiRCkiotfF4r4dRwycDKzjm07h0uXvCFYSwzDGhKt7AitioLXi0HKp/e/OV Jci9uYLHgjCRRPYzzb5ly9YW9Laa0HECAYCc5WHoOCigEquEKXvWKQJdQd1PQ/Xx OUaLzfGnCB+WEzJho3BnLaD7KkEMlg6hk6zKF0l+WcS/Tl/pUQKM2k96dU6QlWtV kpMVMDJfoQDb7Og9QZZ0yxd28sYNObIfzUkfsIV4klpEToEtyUZC+JL+CQN3XDbK 94bDR4KvU2ziw8LeDsxoi0UxcvZjOqtRbNLnI3wS4oOAdif6iDVnWzfbU902AWI0 ojeJ7aZC98t3T0hVtyyC3B5aB6ADWKaIkizvmFtqz+hjCa/l/Lw= =3mpO -----END PGP SIGNATURE----- --467AKG5kT2VkpE+f--