From nobody Sat May 18 23:44:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630691115; cv=none; d=zohomail.com; s=zohoarc; b=bOoNpp+pXZH+ZsM3sqXvY7JyaUXNiIwN3G0fgIfwJr03aokuZ3iErTUt3Sj+2exbw7M4jlYuTjD+SIbhdueKcbdKNXlY7U2QTjWiAgzTaqwzvtAS05uaUOrT6je75Z1GSjY+C1G3CpHqi+IqkMWKw/dzkx3yxlfcQ2ncQ2GukTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630691115; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=5pxglglrBjktMPrcMnRa0MQmvg3ha7aIsW8uhOkppUs=; b=hF9D1RySB/18rWzlVrfldlsb/Otomhn3FPu1guevvxss5Xj+3d8mb2aD4JtLu1fRII9waKNpS+iamZXfXnepKtihuzN1XcQQC2sM8QxrqCAk4PG0dJSoja41Nrso2dd3/hr9JSfCvqx57Am8Ve82RbWFFYu+jiM8/8PsIxa9iu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1630691115989462.57966623714367; Fri, 3 Sep 2021 10:45:15 -0700 (PDT) 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-556-tgIGFcjdOamTmZ6tEgT15Q-1; Fri, 03 Sep 2021 13:45:13 -0400 Received: by mail-wm1-f71.google.com with SMTP id s197-20020a1ca9ce000000b002e72ba822dcso44675wme.6 for ; Fri, 03 Sep 2021 10:45:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id v5sm5111506wrw.44.2021.09.03.10.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 10:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630691114; 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; bh=5pxglglrBjktMPrcMnRa0MQmvg3ha7aIsW8uhOkppUs=; b=NeDs8OSbX0DAWQChth+Ru1K1a3hRcr/BzjGtPvmXMhKITxBUV1/v2lVDSMdnaSXQi2mN6D ttcTArKtKmUOqBBttIXLOC/GncLDvXUsDJgWuCGo1SsG4QHjrap9byQbsffNLUDYI/jENF wMSamH3Y6Yj6kHLxlxOln+b/DLywV8M= X-MC-Unique: tgIGFcjdOamTmZ6tEgT15Q-1 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:mime-version :content-transfer-encoding; bh=scQC4+mFjIe2ASr4s0NfJ0tOtGyU6KRT6zsforUnNCg=; b=maSWqfnaPu8IyElh50Vm6HZNr8UO93uZjPLFM5evSlIsFOhHJqYCQvMw3E6k04mAl8 rK/d+/esu9GuTJ1/w9qRwTT0sIsJ/n9bYVvEpX9xAqGmVUMakaNDrNbR1wgL6cuF90rG lIM1vt8OOCFH49yaRRCpIEIn1Wz6vqmlSKdPXNhuR4cPU0//eCFJR+KSaWklZMTwKXSf JDjvtV/Qa0XVpZJeRYhIWsx+BB4xGYYxh7AtY7ce8NPKVHiRJoiZFBPJEKTDvkIPaljC 5gWHTsf4r6HlwjJIulk5OlOOmATWxGKpSb08pcFQLOZi+R8LghTVczrLwvxkByRd/2N6 fZzg== X-Gm-Message-State: AOAM531zwIGCZENSBqerAHHp7JmOApCO/KHjOdGRHN0cJgI+dG0jstzX hYCrpEYQbjWJxG/uODPCwLxDWxQzd75nRghjLiLa7QTS0WoFAgJEcyL2jccTSq3NgZUVKtgAGIp v03rheVBIWFSJYA== X-Received: by 2002:adf:e68b:: with SMTP id r11mr273928wrm.394.1630691112638; Fri, 03 Sep 2021 10:45:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfaorDhaZgd7Il9OcYLqMKVldGIhalwsexT83SykhTCAo51zUyY6dGWgUk8dkPBqSMkrwkGw== X-Received: by 2002:adf:e68b:: with SMTP id r11mr273914wrm.394.1630691112462; Fri, 03 Sep 2021 10:45:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Peter Maydell , qemu-arm@nongnu.org, David Gibson , Kevin Wolf , Richard Henderson , Markus Armbruster , Thomas Huth , Jason Wang , Christian Schoenebeck , Marcel Apfelbaum , Paolo Bonzini , Vladimir Sementsov-Ogievskiy , David Hildenbrand , Eduardo Habkost , Eric Blake , John Snow , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Hanna Reitz , qemu-block@nongnu.org, qemu-ppc@nongnu.org, "Daniel P . Berrange" Subject: [PATCH v3 00/28] glib: Replace g_memdup() by g_memdup2() Date: Fri, 3 Sep 2021 19:44:42 +0200 Message-Id: <20210903174510.751630-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 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: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630691117718100001 Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdu= p2-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. g_memdup() as been deprecated in GLib 2.68. Since QEMU defines GLIB_VERSION_MAX_ALLOWED to GLIB_VERSION_2_56, the deprecation is not displayed (on GLib >=3D 2.68 such available on Fedora 34). However the function is still unsafe, so it is better to avoid its use. This series provides the safely equivalent g_memdup2() wrapper, and replace all g_memdup() calls by it. The previous link recommend to audit the call sites. Most of the calls use byte_size=3Dsizeof(STRUCT), and no STRUCT appears to be > 4GiB. Few calls use unsigned/size_t/uint16_t. Where code is doing multiplication, patches are sent as RFC. In particular: hw/net/virtio-net.c hw/virtio/virtio-crypto.c Since v1: - Added missing g_memdup2 -> g_memdup2_qemu compat definition (danpb) - Do not call g_memdup2_qemu() but directly g_memdup2() (danpb) Tested with the following snippet: -- >8 -- diff --git a/include/glib-compat.h b/include/glib-compat.h index 8d01a8c01fb..2b33dea71a8 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -21,3 +21,3 @@ */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56 +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_68 @@ -26,3 +26,3 @@ */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_68 --- Philippe Mathieu-Daud=C3=A9 (28): hw/hyperv/vmbus: Remove unused vmbus_load/save_req() glib-compat: Introduce g_memdup2() wrapper qapi: Replace g_memdup() by g_memdup2() accel/tcg: Replace g_memdup() by g_memdup2() block/qcow2-bitmap: Replace g_memdup() by g_memdup2() softmmu: Replace g_memdup() by g_memdup2() hw/9pfs: Replace g_memdup() by g_memdup2() hw/acpi: Avoid truncating acpi_data_len() to 32-bit hw/acpi: Replace g_memdup() by g_memdup2() hw/core/machine: Replace g_memdup() by g_memdup2() hw/hppa/machine: Replace g_memdup() by g_memdup2() hw/i386/multiboot: Replace g_memdup() by g_memdup2() hw/net/eepro100: Replace g_memdup() by g_memdup2() hw/nvram/fw_cfg: Replace g_memdup() by g_memdup2() hw/scsi/mptsas: Replace g_memdup() by g_memdup2() hw/ppc/spapr_pci: Replace g_memdup() by g_memdup2() hw/rdma: Replace g_memdup() by g_memdup2() hw/vfio/pci: Replace g_memdup() by g_memdup2() hw/virtio: Replace g_memdup() by g_memdup2() net/colo: Replace g_memdup() by g_memdup2() ui/clipboard: Replace g_memdup() by g_memdup2() linux-user: Replace g_memdup() by g_memdup2() tests/unit: Replace g_memdup() by g_memdup2() tests/qtest: Replace g_memdup() by g_memdup2() target/arm: Replace g_memdup() by g_memdup2() target/ppc: Replace g_memdup() by g_memdup2() contrib: Replace g_memdup() by g_memdup2() checkpatch: Do not allow deprecated g_memdup() include/glib-compat.h | 37 +++++++++++++++++++++++ include/hw/hyperv/vmbus.h | 3 -- accel/tcg/cputlb.c | 8 ++--- block/qcow2-bitmap.c | 2 +- contrib/plugins/lockstep.c | 2 +- contrib/rdmacm-mux/main.c | 10 +++---- hw/9pfs/9p-synth.c | 2 +- hw/9pfs/9p.c | 2 +- hw/acpi/core.c | 3 +- hw/arm/virt-acpi-build.c | 2 +- hw/core/machine.c | 4 +-- hw/hppa/machine.c | 8 ++--- hw/hyperv/vmbus.c | 59 ------------------------------------- hw/i386/acpi-build.c | 6 ++-- hw/i386/multiboot.c | 2 +- hw/net/eepro100.c | 2 +- hw/net/virtio-net.c | 3 +- hw/nvram/fw_cfg.c | 9 +++--- hw/ppc/spapr_pci.c | 7 ++--- hw/rdma/rdma_utils.c | 2 +- hw/scsi/mptsas.c | 5 ++-- hw/vfio/pci.c | 2 +- hw/virtio/virtio-crypto.c | 6 ++-- linux-user/syscall.c | 2 +- linux-user/uaccess.c | 2 +- net/colo.c | 4 +-- qapi/qapi-clone-visitor.c | 16 +++++----- qapi/qapi-visit-core.c | 6 ++-- softmmu/memory.c | 2 +- softmmu/vl.c | 2 +- target/arm/helper.c | 6 ++-- target/ppc/mmu-hash64.c | 2 +- tests/qtest/libqos/ahci.c | 6 ++-- tests/qtest/libqos/qgraph.c | 2 +- tests/unit/ptimer-test.c | 22 +++++++------- tests/unit/test-iov.c | 26 ++++++++-------- ui/clipboard.c | 2 +- scripts/checkpatch.pl | 5 ++++ 38 files changed, 138 insertions(+), 153 deletions(-) --=20 2.31.1