From nobody Mon Feb 9 08:10:05 2026 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=1630667382; cv=none; d=zohomail.com; s=zohoarc; b=XlWCzBd+TMk8V5rcslTaNVMIMZWd9wepnwVZ+FTDsMTTO006iEV/D5bzfWCc2HakA8XPdtyieAPsEwqzDbppjIgJq0zwtWwkhdugJnGe7wKLCbyCv4S6Y4ASPhIJ1ai6LG9+XOozu0vMGsO8je9vZFjr4R7HC+4DhIBw9TDQsDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630667382; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jqD7iyLbQ9DTFxBdziDoBhccB1nGTykeUMkgqm25WoQ=; b=FW9JGpzfh5P/cadzzwgIrmO+2q/2urZF/n1AJxoOJQ7cvpcKkBUms1JUj0hzA2gb0VNtu4Fl2HO35ctxaNX+u1jZOzKlyNOXZE5oZJ/YsEpPCyBYVYkbspbsk/8UJIEGaAEM8Xt+kS1g+FC5JEceuHnPXo+C4d3KQ3KR1hx0s2Q= 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 163066738267557.941231051949785; Fri, 3 Sep 2021 04:09:42 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-516-gbQ9a3KTMvy5QoAaYBuIXw-1; Fri, 03 Sep 2021 07:09:39 -0400 Received: by mail-wm1-f70.google.com with SMTP id b126-20020a1c8084000000b002f152a868a2so1708061wmd.1 for ; Fri, 03 Sep 2021 04:09:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id t23sm4712670wrb.71.2021.09.03.04.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667381; 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=jqD7iyLbQ9DTFxBdziDoBhccB1nGTykeUMkgqm25WoQ=; b=M5xkaaMAVeoqtYNnyAenGgs4NiejCA5NwMnk0lKkE1B9vZJOSHptSVz4cytRcunhQpDKTU 0JvA22hhdKH3rnNLe5n29ksiBK4iyd5LiOPhNUpitZEgD1j9xl8WCDZXro9C6+bGUwiw43 mKY95yXvOfAZ2owsbqjpaig1NT2tYO0= X-MC-Unique: gbQ9a3KTMvy5QoAaYBuIXw-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jqD7iyLbQ9DTFxBdziDoBhccB1nGTykeUMkgqm25WoQ=; b=XI24TzOt/Tnk2Ta5b+nZLWrF22QDW9EnnHwkVK+EhRlD2YJ1K8zJvbERTS0lo0+Ykj OAIT/pqHgBXqGUvf7QsNNebKVCKyobP3/Vnn+hjC7k9jpaIjWcq3i8YV+G2szDVDUCTZ Fw7ModSSq5bKBFktJKRx6WaicUNx1VUStGQtIgNVkRPd4ILyUc07zFmKR1JkHeAJa3DA guVuUKJlQfy+Q+Q6qdOiNkMe5JARSAnQStKiOQ9JVupycRdnG1sZQvyVR2pH+zjdL2r7 WOb0Bv5SDIjdJGx/Cfk5ATNIcmk5rKCjlmcrxxs3nvhjZBA+pTnZuKkQZm25YE6GfNRL dWcQ== X-Gm-Message-State: AOAM530hzf5rjo+Ea79zLPC0c/rzIiPkvlbUSONQGxA1gjCko+ZjYK+Z sVZQbrMl5BhMXhFGN8v/uJk6U/5w1fgeiq1vS1CnhC06CcwRI5PEoUURJuMHc5p0H/QLHrBAW0n ZBv1IMtjdlXwC+A== X-Received: by 2002:adf:f9cb:: with SMTP id w11mr3531984wrr.382.1630667378602; Fri, 03 Sep 2021 04:09:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMOvBdWerfmwLS6/8RuY/Oazm/1aA8TyZs75/crfM2ZbilJZTIPESof8HJh+OnE/0lMkkuSw== X-Received: by 2002:adf:f9cb:: with SMTP id w11mr3531951wrr.382.1630667378445; Fri, 03 Sep 2021 04:09:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Igor Mammedov , Laurent Vivier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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" , David Gibson , 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, David Hildenbrand Subject: [PATCH 27/28] contrib: Replace g_memdup() by g_memdup2_qemu() Date: Fri, 3 Sep 2021 13:07:01 +0200 Message-Id: <20210903110702.588291-28-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903110702.588291-1-philmd@redhat.com> References: <20210903110702.588291-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: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630667383414100001 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. Replace g_memdup() by the safer g_memdup2_qemu() wrapper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- contrib/plugins/lockstep.c | 2 +- contrib/rdmacm-mux/main.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index 7fd35eb6692..119a8054b3f 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState = *them) } } divergence_log =3D g_slist_prepend(divergence_log, - g_memdup(&divrec, sizeof(divrec))); + g_memdup2_qemu(&divrec, sizeof(divrec= ))); =20 /* Output short log entry of going out of sync... */ if (verbose || divrec.distance =3D=3D 1 || diverged) { diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 771ca01e03f..d447d50f538 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -227,8 +227,8 @@ static RdmaCmMuxErrCode add_fd_ifid_pair(int fd, __be64= gid_ifid) RDMACM_MUX_ERR_CODE_EACCES; } =20 - g_hash_table_insert(server.umad_agent.gid2fd, g_memdup(&gid_ifid, - sizeof(gid_ifid)), g_memdup(&fd, sizeof(fd))); + g_hash_table_insert(server.umad_agent.gid2fd, g_memdup2_qemu(&gid_ifid, + sizeof(gid_ifid)), g_memdup2_qemu(&fd, sizeof(fd))= ); =20 pthread_rwlock_unlock(&server.lock); =20 @@ -250,7 +250,7 @@ static RdmaCmMuxErrCode delete_fd_ifid_pair(int fd, __b= e64 gid_ifid) return RDMACM_MUX_ERR_CODE_ENOTFOUND; } =20 - g_hash_table_remove(server.umad_agent.gid2fd, g_memdup(&gid_ifid, + g_hash_table_remove(server.umad_agent.gid2fd, g_memdup2_qemu(&gid_ifid, sizeof(gid_ifid))); pthread_rwlock_unlock(&server.lock); =20 @@ -267,8 +267,8 @@ static void hash_tbl_save_fd_comm_id_pair(int fd, uint3= 2_t comm_id, =20 pthread_rwlock_wrlock(&server.lock); g_hash_table_insert(server.umad_agent.commid2fd, - g_memdup(&comm_id, sizeof(comm_id)), - g_memdup(&fde, sizeof(fde))); + g_memdup2_qemu(&comm_id, sizeof(comm_id)), + g_memdup2_qemu(&fde, sizeof(fde))); pthread_rwlock_unlock(&server.lock); } =20 --=20 2.31.1