From patchwork Fri Sep 3 11:07:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1524259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Vb21pMcH; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4H1FrY0mXYz9sRf for ; Fri, 3 Sep 2021 21:27:25 +1000 (AEST) Received: from localhost ([::1]:46456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM7Lu-0006sC-RQ for incoming@patchwork.ozlabs.org; Fri, 03 Sep 2021 07:27:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM74q-0001JC-Sa for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:09:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM74n-0002AQ-GT for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:09:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667380; 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=Vb21pMcHoSPZwry1LiOn0Orkon7uiqaGUrrT92zfiMsVyMjmiKQAK+VCxdvwF3XafNMOQF oMieNzoA+o1GMs8irZkEKd/oczv8G+JTM1qbRm77Re1MMFzhP4Y5BntTh2p9wCiW6h2/qD B6D+F5yISnyHOe47MEcxFOUYp4fJMEE= 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-199-LGqMSfsENzqjm6UEG7Ethw-1; Fri, 03 Sep 2021 07:09:40 -0400 X-MC-Unique: LGqMSfsENzqjm6UEG7Ethw-1 Received: by mail-wm1-f71.google.com with SMTP id b126-20020a1c8084000000b002f152a868a2so1708074wmd.1 for ; Fri, 03 Sep 2021 04:09: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=jqD7iyLbQ9DTFxBdziDoBhccB1nGTykeUMkgqm25WoQ=; b=pib1O/7I0xhOkYCoaKE4/R8WIigjPWIO6+iFMezNgHtrvMAUuwB3g+JEBwj9n+7JF2 gEYDjAuDNE6GEDcrgqVMVA47WNAtdXd2L/W0WnG8uuJC4FOrdh2p/qvEh6eCuDavUUoB /oNjBo12Nd06JiH9vRaoilWmCiyHY1N+qMLjNnY9julUvGniuOV74qie9wR6a80WRhnJ Jgd2fKU41vzHEgBUAyuzcU0JCHPLCDhl4e8qeFkGWY/7pV3HnRGNI95Sz9V6dCbLlpk7 gIS5v3QQPbiXLMYUItxHWdXc3nieCHD9Bq5wmCqnLmFPhbjQMTkhe8oW8NGozALBhcMF fMvQ== X-Gm-Message-State: AOAM532tdRkj4U9L9jjHRNy8+s9cfTn4JV0OXSxHO1lK+lbT1dP2F/ps flm9J+fvcfCLGuWCeaJkzOH3ah7INIxIVQEb44AhQd/wGKKLi8BdtCYMneKVyIhaBkiS557adnl ZtbdUYw2sn4OsHO79ChXX8MWarNCLtTg6Kf+3gBTc7tQQZb2T29EX2EHHcV2NNE+0 X-Received: by 2002:adf:f9cb:: with SMTP id w11mr3532015wrr.382.1630667378688; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 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: Fam Zheng , Peter Maydell , Li Zhijian , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Yuval Shaia , Peter Xu , Gerd Hoffmann , Alexandre Iooss , Eric Blake , qemu-block@nongnu.org, Zhang Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , Helge Deller , David Hildenbrand , Markus Armbruster , "Gonglei \(Arei\)" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Michael Roth , Richard Henderson , Greg Kurz , Alex Williamson , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Shannon Zhao , Hanna Reitz , qemu-ppc@nongnu.org, Igor Mammedov , Mahmoud Mandour Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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_qemu() wrapper. Signed-off-by: Philippe Mathieu-Daudé --- 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 = g_slist_prepend(divergence_log, - g_memdup(&divrec, sizeof(divrec))); + g_memdup2_qemu(&divrec, sizeof(divrec))); /* Output short log entry of going out of sync... */ if (verbose || divrec.distance == 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; } - 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))); pthread_rwlock_unlock(&server.lock); @@ -250,7 +250,7 @@ static RdmaCmMuxErrCode delete_fd_ifid_pair(int fd, __be64 gid_ifid) return RDMACM_MUX_ERR_CODE_ENOTFOUND; } - 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); @@ -267,8 +267,8 @@ static void hash_tbl_save_fd_comm_id_pair(int fd, uint32_t comm_id, 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); }