From nobody Tue Apr 7 21:56:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1773242421; cv=none; d=zohomail.com; s=zohoarc; b=Cf4Fdhl/3Meupr0AxPam6Bi5mwVXFx+3OeVY42diMnu/UiuN8BOW1Hp8Aq6iNa4dHd9F6KTJQQ5GYJTR6hFPywJYeRp0H+P0HbLuEt7yqrf21L3oJ4L/E4XquqxT7S2wXoQSRA/bnZeiok6Rcc9ZVZ9WCL7wPYRS/S3i+1aWKPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773242421; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=moaq7aAotLVAHCO+R3GnxrRUBxMLHN1WhstuHvJmu8I=; b=aC9VGeUm3q74lj+7ckVPtCTdA8yqq2yV1w4oK4XGgdpwU21wMkdcV5moxzSnUBK0UStRhYlEXhOpwq2AQo5TCRAx5oOT0nW+E6AK9x9Pgl7flxPFkYlHXteM/e2gA6wggR6dAPqTIQTqC7YzWoNMOvV/5+lwkepMey6gOsrGK0w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773242421723718.3366887610738; Wed, 11 Mar 2026 08:20:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LEM-0007Xs-Ne; Wed, 11 Mar 2026 11:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0LCk-0003LL-3u; Wed, 11 Mar 2026 11:10:36 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0LCi-00066n-7W; Wed, 11 Mar 2026 11:10:33 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E3ED6191EAB; Wed, 11 Mar 2026 18:04:43 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id D27B437C2EC; Wed, 11 Mar 2026 18:05:21 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241483; bh=i5G8m9dRPewkpdIulNcPCBXXnfGy3NUn3VT0YYzQvXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xYK748be4Xc4egzaagQzkHGoWdwl8C/0li5H8XyhFGXzIeB9xZaeqp68BzK3gd4gP bH1mCEdqZUvB9d9kQHTc77V1sLb7z3KwSeUe/wyTmxf5Rjej5daZkzY7dNH227vu5b vnQNRPeTaeUJLUgXIMNJOS9bJemLne5ilWb9VZIMLr1QM4OeOV58HlxO3CKfhO1GNR JH1cdf+qKNi16Xyqw2gYTHpsPoqHtjoclvQdUozeqUHv9A6K7ymAB4enfv82zeV2uy mAGzUN2O+Zxau6VmlDMmeoKP7xfetSDq9wBhlpiPGtTdPWgo+iX8vbj6WxxCU6VFkK vfAdd/HFUry3w== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Bingwu Zhang , Helge Deller , Michael Tokarev Subject: [Stable-10.1.5 40/46] linux-user: Deal with mmap where start > reserved_va Date: Wed, 11 Mar 2026 18:03:16 +0300 Message-ID: <20260311150327.1084669-40-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @tls.msk.ru) X-ZM-MESSAGEID: 1773242423947158500 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Fixes: 4c13048e02d9 ("linux-user: Use page_find_range_empty for mmap_find_v= ma_reserved") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3310 Signed-off-by: Bingwu Zhang Reviewed-by: Helge Deller Signed-off-by: Helge Deller (cherry picked from commit f2813e13fe910e01127271a87177a477b9438bc6) Signed-off-by: Michael Tokarev diff --git a/linux-user/mmap.c b/linux-user/mmap.c index da5ff46a0f..e49dbaaa20 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -418,12 +418,15 @@ abi_ulong mmap_next_start; static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size, abi_ulong align) { - target_ulong ret; + target_ulong ret =3D -1; =20 - ret =3D page_find_range_empty(start, reserved_va, size, align); + if (start <=3D reserved_va) { + ret =3D page_find_range_empty(start, reserved_va, size, align); + } if (ret =3D=3D -1 && start > mmap_min_addr) { /* Restart at the beginning of the address space. */ - ret =3D page_find_range_empty(mmap_min_addr, start - 1, size, alig= n); + ret =3D page_find_range_empty(mmap_min_addr, MIN(start - 1, reserv= ed_va), + size, align); } =20 return ret; --=20 2.47.3