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=-16.5 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,URIBL_BLOCKED,USER_AGENT_GIT 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 3139CC433EF for ; Fri, 3 Sep 2021 18:04:52 +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 C8BDF60F12 for ; Fri, 3 Sep 2021 18:04:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C8BDF60F12 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]:44344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMDYX-0000hM-S3 for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 14:04:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMDH4-0000la-6m for qemu-devel@nongnu.org; Fri, 03 Sep 2021 13:46:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMDH0-0001jj-9l for qemu-devel@nongnu.org; Fri, 03 Sep 2021 13:46:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630691201; 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=bmgDp5DDf2ZYN3DOZIz+XL4zsyjy3fDEm1GYA+/wcf0=; b=f/2WtxnzQxHPB9VgehUVrYWuBr+kCuZLQ+fEjFANEo97R1jE7zAnlvM71ViipoTjVDWnIh yW0syCTX6Nf2mkEI0tQEo9MS1FH9+hEI8ZWBd+D/KR8O1eNkBgynBMAhVed0Rs6KuMrmaN VmikQNzmS9frryu+77Lb82YQJ2V/m/s= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-543-VsdaVgcyNUujRcrGtd6moA-1; Fri, 03 Sep 2021 13:46:40 -0400 X-MC-Unique: VsdaVgcyNUujRcrGtd6moA-1 Received: by mail-wm1-f71.google.com with SMTP id w25-20020a1cf6190000b0290252505ddd56so2143644wmc.3 for ; Fri, 03 Sep 2021 10:46:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bmgDp5DDf2ZYN3DOZIz+XL4zsyjy3fDEm1GYA+/wcf0=; b=D/1oDAgHeHOgfXXrx8ujSHLOQb4Qa7q3r9tyqfXH5cYYKm24lyn04GooSe1WHyQZBh NzFxyhirfbU4ww1ihBlsXmlTO6I/zp7LbSIllJ+6DSprMT5542YB5YdPQ83eCnvRgW2Y SvkQiFOogW7DgYHI42R8BwP+EhXXUS+yMF1PmJPl0DMBC3AvTbcf42a8CqyoD8xvNOrw FiRrVr2lmflxtcVcMSVI+xLNA0qz+0q0Pr9WXPFEM2+ta7K6auJtQBRUE7YqwwJdxt70 o7wqZHfrYv38qtu6s5H0c2D5TLjdZDQyIGUjuTcjpcVjA9azh1PZ3upXIJtYOeH0F8fJ rc5A== X-Gm-Message-State: AOAM530kj4K7d4078mdeNIhfGRQC1tZgBIBpWpAmN5xkGEJFghCpdsWK ga8G+dMLoYN1quEx0HLHQKflgBeDGeh/CzXhXsD/NrA4NF9ruir113dc3tDyzqc0UPjtsuj/uGf hDXbnCMfwR0Uh96KmoI1ymhl2ba5s25hp/DyhSB0wcSxOL3C540EhKGk6AnB3z9d6 X-Received: by 2002:a5d:69c8:: with SMTP id s8mr279765wrw.324.1630691199330; Fri, 03 Sep 2021 10:46:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+ttKzuPIZq+gni0UYRID0f4YHvdMTp6gk8JaYOj2INPtxFbcJQed34V6fveyYjSwmdgWDmQ== X-Received: by 2002:a5d:69c8:: with SMTP id s8mr279735wrw.324.1630691199158; Fri, 03 Sep 2021 10:46:39 -0700 (PDT) Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id g138sm30217wmg.34.2021.09.03.10.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 10:46:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 16/28] hw/ppc/spapr_pci: Replace g_memdup() by g_memdup2() Date: Fri, 3 Sep 2021 19:44:58 +0200 Message-Id: <20210903174510.751630-17-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903174510.751630-1-philmd@redhat.com> References: <20210903174510.751630-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@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.392, 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: Peter Maydell , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Gerd Hoffmann , Eric Blake , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Hildenbrand , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , qemu-arm@nongnu.org, John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , "Daniel P . Berrange" , Hanna Reitz , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538 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. Replace g_memdup() by the safer g_memdup2() wrapper. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr_pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 7430bd63142..8e36cffab79 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2201,10 +2201,9 @@ static int spapr_pci_post_load(void *opaque, int version_id) int i; for (i = 0; i < sphb->msi_devs_num; ++i) { - key = g_memdup(&sphb->msi_devs[i].key, - sizeof(sphb->msi_devs[i].key)); - value = g_memdup(&sphb->msi_devs[i].value, - sizeof(sphb->msi_devs[i].value)); + key = g_memdup2(&sphb->msi_devs[i].key, sizeof(sphb->msi_devs[i].key)); + value = g_memdup2(&sphb->msi_devs[i].value, + sizeof(sphb->msi_devs[i].value)); g_hash_table_insert(sphb->msi, key, value); } g_free(sphb->msi_devs); -- 2.31.1