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=-15.1 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,USER_AGENT_SANE_2 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 F3ABFC433EF for ; Wed, 8 Sep 2021 07:19:19 +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 82ED861163 for ; Wed, 8 Sep 2021 07:19:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 82ED861163 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNrra-0005H9-On for qemu-devel@archiver.kernel.org; Wed, 08 Sep 2021 03:19:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNrp1-0000vC-Hv for qemu-devel@nongnu.org; Wed, 08 Sep 2021 03:16:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNrox-0005iy-FT for qemu-devel@nongnu.org; Wed, 08 Sep 2021 03:16:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631085394; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=6GDyXJ2SB7V/5WdoqQgmGo1qN+H2yQzdy99/HnZTZFI=; b=eWprgtWD2CQkUj4bBj2dYPqvDmJnNRFVDErykzHUM3Q4PS7NqjmMLtrihYSJejGGzcEVKa KFSqZfVinBn/+kqCyYNOldiwgSK8OuAM6OFsaDpd239A5AqTC+5KHO9BwWSk7ywwa9dPUu HqyT2GBTAv5n2A1A7helmkvvOYuyD28= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-597-64nybcYAPwa8yImuJnwNlg-1; Wed, 08 Sep 2021 03:16:32 -0400 X-MC-Unique: 64nybcYAPwa8yImuJnwNlg-1 Received: by mail-ed1-f72.google.com with SMTP id v13-20020a056402174d00b003c25d6b2f13so622501edx.4 for ; Wed, 08 Sep 2021 00:16:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6GDyXJ2SB7V/5WdoqQgmGo1qN+H2yQzdy99/HnZTZFI=; b=AuTjVKMJI7Qhbn9QjdTF47ETz+7toTMgHJOSBtOUdDqRJ517riVYflgTZoBmC2b0A5 2iGQeXHV9UHLetVXqEZxhUUhmQIMyOoLHP9zLLWQ6X1jHR3b/3lc6IY4MBU6GV40km3Y W2wz2FPfq/CTwlWT7u1DXbidOKzfNbDxO0lwSrPibRQBfQMCH+S9oujfehL2LBnWop5R Ie7GqcUninaqainFU66KZUQQzU8DOwdr2xN0LHv8O2axiiLqqywdFonBfpiVsZ8AFWt4 0AwTOFCwraS61zMFvs+WbFuUOzc2UywfJikw939hrko1aztGr+M9uBzx42eWweLoz0QS ZULw== X-Gm-Message-State: AOAM533GgkbJ5CUWhvsQIdZPZP4wsQZYfaduvJDljsc1ycdsvAj979M2 uDL34IkHXjhvw0MeSuWtGswNr8zPz0gcBkoYw7Y1B3uBj6nGdnCxRwooz722k2mNTpRylKWKPoV ytqa3UUgtywFdyro= X-Received: by 2002:aa7:d601:: with SMTP id c1mr2346080edr.143.1631085391018; Wed, 08 Sep 2021 00:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxY81tlsZjVwIAyTaqOCOorA5wDSELu+yPVBJv7Jul5m03BFDRvbAK1lTZToqv8r+0KrYJczg== X-Received: by 2002:aa7:d601:: with SMTP id c1mr2346042edr.143.1631085390807; Wed, 08 Sep 2021 00:16:30 -0700 (PDT) Received: from localhost (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id bm26sm514736ejb.16.2021.09.08.00.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 00:16:30 -0700 (PDT) Date: Wed, 8 Sep 2021 09:16:28 +0200 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH 09/28] hw/acpi: Replace g_memdup() by g_memdup2_qemu() Message-ID: <20210908091628.3f08afa3@redhat.com> In-Reply-To: <20210903110702.588291-10-philmd@redhat.com> References: <20210903110702.588291-1-philmd@redhat.com> <20210903110702.588291-10-philmd@redhat.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.391, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 =?UTF-8?B?QmVubsOpZQ==?= , 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, John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Shannon Zhao , Hanna Reitz , qemu-ppc@nongnu.org, Paolo Bonzini , Mahmoud Mandour Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 3 Sep 2021 13:06:43 +0200 Philippe Mathieu-Daud=C3=A9 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=C3=A9 Acked-by: Igor Mammedov > --- > hw/acpi/core.c | 3 ++- > hw/i386/acpi-build.c | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/acpi/core.c b/hw/acpi/core.c > index 1e004d0078d..9dd2cf09a0b 100644 > --- a/hw/acpi/core.c > +++ b/hw/acpi/core.c > @@ -637,7 +637,8 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *pa= rent, > suspend[3] =3D 1 | ((!disable_s3) << 7); > suspend[4] =3D s4_val | ((!disable_s4) << 7); > =20 > - fw_cfg_add_file(fw_cfg, "etc/system-states", g_memdup(suspend, 6= ), 6); > + fw_cfg_add_file(fw_cfg, "etc/system-states", > + g_memdup2_qemu(suspend, 6), 6); > } > } > =20 > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index aa269914b49..54494ca1f65 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2785,7 +2785,7 @@ void acpi_setup(void) > */ > unsigned rsdp_size =3D acpi_data_len(tables.rsdp); > =20 > - build_state->rsdp =3D g_memdup(tables.rsdp->data, rsdp_size); > + build_state->rsdp =3D g_memdup2_qemu(tables.rsdp->data, rsdp_siz= e); > fw_cfg_add_file_callback(x86ms->fw_cfg, ACPI_BUILD_RSDP_FILE, > acpi_build_update, NULL, build_state, > build_state->rsdp, rsdp_size, true);