From nobody Mon Feb 9 21:37:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1630667359; cv=none; d=zohomail.com; s=zohoarc; b=KUGZ5bHeSjzbVzKRlCwLzvQd/3RerUPos8l6H11cg3Zqra6KDVbb+qtMMM92D10D/56xt4F+DFKDLc9eUuX5p6GtZ7tBknoSd1/hBwVDE1dYGXtzNI7SvtFXpUX1Mm39kH5BPJsVn2z4+BN90/aPOVpcf6yBmSgCKSCGmBhpROk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630667359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PNmQn7pp74t94Lr73ldUSMDFHfSQgs8qkh8r7R4cWBA=; b=OKnlauiQtCdUwNao0dFQKZ5f9Inq/Nk9vjiaBCJR8FJHxc62d24cj/Oqfl/02rrExgZSGlZthOnoL42dNtRZsSI5CqsOHT9oUBENG/XVUFB4jBK0y1N2M+NlPVAm9GT5CamvgEw3wz7UaBzolmN6xMA6qqdEVaTBURu9KXPLLKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1630667359346297.18725026332356; Fri, 3 Sep 2021 04:09:19 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-bucKqufpPMuSba-XFcmzTQ-1; Fri, 03 Sep 2021 07:09:17 -0400 Received: by mail-wr1-f71.google.com with SMTP id v6-20020adfe4c6000000b001574f9d8336so1460814wrm.15 for ; Fri, 03 Sep 2021 04:09:16 -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 k25sm4751451wrd.42.2021.09.03.04.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667358; 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=PNmQn7pp74t94Lr73ldUSMDFHfSQgs8qkh8r7R4cWBA=; b=OPFGc6avkdVAKor4APa+KJ8kHQfLCiqr5f/wf1rMVF9HTCUz/ZLI9YlV9hXkm+47rPDPeZ SQ9JZ2qxwPztqC14SvaVnAc9LCIcnj77IprH7cHVJNdNUgiONowj1AwoXFVEOKXy98Ueji LZBZrYNn53p5zlHvvQ7hazbQIDMMZEI= X-MC-Unique: bucKqufpPMuSba-XFcmzTQ-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=PNmQn7pp74t94Lr73ldUSMDFHfSQgs8qkh8r7R4cWBA=; b=ImPosVh9s7bu0rDU32ZrazdtPlV/RC1HYSTXGNi/DHYI11dkiOFy4HdWVVfRG3t242 EPWmRLLWFhfA2kLsGS3+AvQ7zLB+E0KWA701kYJnuMjWmu7uqukwf8sMbiMDZPmfauvN obwXE2IuaqAzk4ZvQhfNuIMECSL9nanT1QtICTY9e3Y2FCuxKGrz4flVqYblLz/F2REf wCyqnmGIr0EjvsOY51RL10wFqbvAJsByhK7QN46JSpz/INfg4qxrBCENuXPYsS0K0lBN fMIWNxjB20TgvqDwpOPWNH2s/UXgH/ct4HCoQ0ud9m2Pyl+E7tPLfvJnhjUPZtnHSXKk o9Ow== X-Gm-Message-State: AOAM530NAxDYc7EqrRH0RdVSARRHUSo0u5wP/v3HG0BnBet7sLXwLx4z nVdPAoBQxRsUJNCN6j0EO/qiVuPvEhJOQsikN5mcJRhsx5qSmiqMeyZLiN4f7t/GymrrvYq3hpH 3d8TQ9xyRRqawUA== X-Received: by 2002:a5d:6cb0:: with SMTP id a16mr3413376wra.245.1630667355849; Fri, 03 Sep 2021 04:09:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7GNZSDtH7eNMhcSg/f8Lt0w2oSbtabaXRSOl+1qUAig28an7Yx8aZ5ZPl0WYwewdHyBWloA== X-Received: by 2002:a5d:6cb0:: with SMTP id a16mr3413326wra.245.1630667355660; Fri, 03 Sep 2021 04:09:15 -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 23/28] tests/unit: Replace g_memdup() by g_memdup2_qemu() Date: Fri, 3 Sep 2021 13:06:57 +0200 Message-Id: <20210903110702.588291-24-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: 1630667360906100001 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 --- tests/unit/ptimer-test.c | 22 +++++++++++----------- tests/unit/test-iov.c | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/unit/ptimer-test.c b/tests/unit/ptimer-test.c index 9176b96c1ce..23efeb04a57 100644 --- a/tests/unit/ptimer-test.c +++ b/tests/unit/ptimer-test.c @@ -798,64 +798,64 @@ static void add_ptimer_tests(uint8_t policy) =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/set_count policy=3D%s", policy_na= me), - g_memdup(&policy, 1), check_set_count, g_free); + g_memdup2_qemu(&policy, 1), check_set_count, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/set_limit policy=3D%s", policy_na= me), - g_memdup(&policy, 1), check_set_limit, g_free); + g_memdup2_qemu(&policy, 1), check_set_limit, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/oneshot policy=3D%s", policy_name= ), - g_memdup(&policy, 1), check_oneshot, g_free); + g_memdup2_qemu(&policy, 1), check_oneshot, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/periodic policy=3D%s", policy_nam= e), - g_memdup(&policy, 1), check_periodic, g_free); + g_memdup2_qemu(&policy, 1), check_periodic, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_mode_change policy=3D%= s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_mode_change, g_free); + g_memdup2_qemu(&policy, 1), check_on_the_fly_mode_change, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_period_change policy= =3D%s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_period_change, g_free); + g_memdup2_qemu(&policy, 1), check_on_the_fly_period_change, g_free= ); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/on_the_fly_freq_change policy=3D%= s", policy_name), - g_memdup(&policy, 1), check_on_the_fly_freq_change, g_free); + g_memdup2_qemu(&policy, 1), check_on_the_fly_freq_change, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/run_with_period_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_run_with_period_0, g_free); + g_memdup2_qemu(&policy, 1), check_run_with_period_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/run_with_delta_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_run_with_delta_0, g_free); + g_memdup2_qemu(&policy, 1), check_run_with_delta_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/periodic_with_load_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_periodic_with_load_0, g_free); + g_memdup2_qemu(&policy, 1), check_periodic_with_load_0, g_free); g_free(tmp); =20 g_test_add_data_func_full( tmp =3D g_strdup_printf("/ptimer/oneshot_with_load_0 policy=3D%s", policy_name), - g_memdup(&policy, 1), check_oneshot_with_load_0, g_free); + g_memdup2_qemu(&policy, 1), check_oneshot_with_load_0, g_free); g_free(tmp); } =20 diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c index 5371066fb6a..19ae24adb70 100644 --- a/tests/unit/test-iov.c +++ b/tests/unit/test-iov.c @@ -173,7 +173,7 @@ static void test_io(void) } iov_from_buf(iov, niov, 0, buf, sz); =20 - siov =3D g_memdup(iov, sizeof(*iov) * niov); + siov =3D g_memdup2_qemu(iov, sizeof(*iov) * niov); =20 if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) { perror("socketpair"); @@ -350,7 +350,7 @@ static void test_discard_front_undo(void) =20 /* Discard zero bytes */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; iov_discard_front_undoable(&iov_tmp, &iov_cnt_tmp, 0, &undo); @@ -361,7 +361,7 @@ static void test_discard_front_undo(void) =20 /* Discard more bytes than vector size */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); @@ -373,7 +373,7 @@ static void test_discard_front_undo(void) =20 /* Discard entire vector */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); @@ -385,7 +385,7 @@ static void test_discard_front_undo(void) =20 /* Discard within first element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D g_test_rand_int_range(1, iov->iov_len); @@ -397,7 +397,7 @@ static void test_discard_front_undo(void) =20 /* Discard entire first element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; iov_discard_front_undoable(&iov_tmp, &iov_cnt_tmp, iov->iov_len, &undo= ); @@ -408,7 +408,7 @@ static void test_discard_front_undo(void) =20 /* Discard within second element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_tmp =3D iov; iov_cnt_tmp =3D iov_cnt; size =3D iov->iov_len + g_test_rand_int_range(1, iov[1].iov_len); @@ -499,7 +499,7 @@ static void test_discard_back_undo(void) =20 /* Discard zero bytes */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; iov_discard_back_undoable(iov, &iov_cnt_tmp, 0, &undo); iov_discard_undo(&undo); @@ -509,7 +509,7 @@ static void test_discard_back_undo(void) =20 /* Discard more bytes than vector size */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); iov_discard_back_undoable(iov, &iov_cnt_tmp, size + 1, &undo); @@ -520,7 +520,7 @@ static void test_discard_back_undo(void) =20 /* Discard entire vector */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov_size(iov, iov_cnt); iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -531,7 +531,7 @@ static void test_discard_back_undo(void) =20 /* Discard within last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D g_test_rand_int_range(1, iov[iov_cnt - 1].iov_len); iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -542,7 +542,7 @@ static void test_discard_back_undo(void) =20 /* Discard entire last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov[iov_cnt - 1].iov_len; iov_discard_back_undoable(iov, &iov_cnt_tmp, size, &undo); @@ -553,7 +553,7 @@ static void test_discard_back_undo(void) =20 /* Discard within second-to-last element */ iov_random(&iov, &iov_cnt); - iov_orig =3D g_memdup(iov, sizeof(iov[0]) * iov_cnt); + iov_orig =3D g_memdup2_qemu(iov, sizeof(iov[0]) * iov_cnt); iov_cnt_tmp =3D iov_cnt; size =3D iov[iov_cnt - 1].iov_len + g_test_rand_int_range(1, iov[iov_cnt - 2].iov_len); --=20 2.31.1