From nobody Tue Apr 7 21:28:21 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=1773258235; cv=none; d=zohomail.com; s=zohoarc; b=blogWHSnRcrvPa0mQXLWe4nXgOWUks+q0jv0Q9d+d6veIglikcA80OTE9AsOj/GT3Nb6nfy5LFc2CDsHrj5T9xhEH+apFur53aX3Uu/iHOhLVXBcEwwLP10O4UznUnMwqO9b9p5ApqsudzW0MMrIeRCfdFX4YdAL60uQ/kmsLqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773258235; 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=HvsGeHejDKU1xHqR90dgIAEGfqSgxsjnLoL3SdzjfDI=; b=CYrTmpMSszVoHZ/NIabQN396STUvGRj7aNTHXGr6uHU+KdIEubCV0TyASqy0TqV1vRuMk8uQGSzt6iitAuskRABh4qMwLSOZyx+N3TB0KhCpdC8kPXG1Cf2lgGGjfUmU/FMt5PPlTBTWwnvKYaqBjtZvaGKCY26iijmUule4CwM= 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 1773258235322989.1247911453822; Wed, 11 Mar 2026 12:43:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0POq-0000Hn-Ho; Wed, 11 Mar 2026 15:39:20 -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 1w0POn-00005D-7y; Wed, 11 Mar 2026 15:39:17 -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 1w0POj-0000fy-CB; Wed, 11 Mar 2026 15:39:16 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D8CE6192115; Wed, 11 Mar 2026 22:34:29 +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 2815B37C47A; Wed, 11 Mar 2026 22:35:08 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773257669; bh=XhdHV8jczOPNr01/KUn5dRw/sbBAKvqoX5wqAK2Zzzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uuoZDq+j6Y1z1CBPA9EtSALOQKQBxTdw/aqk63IM7suBBCIkEmz1f5FDHGX0yVJTy 1HH7MQkaTVkMREd++9ct94mcB6v4YLzdHtPfmM4V0hAtAH57TvcDc7ItuHP8sPgHpg oCjm+yC9YpT8NWyJsl2VmiBk87JWOgv3ALKS9hQuVuJIL4qoZBzFsd1wYg+yuqF6Po jDUKv+NbJ1Uw0VrtXX550pH+iG0YzTY2XtHbY+Mxp6v+KAaiDq6zBBMN4OICyBnqU+ nt1CDMHH/pxZRBbnOHmuaGahf9qjBbsVLB2mCV3YL8cmg1eFHtnSTICYevdoz4KArA X+23qh9N52sWw== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Bingwu Zhang , Helge Deller , Michael Tokarev Subject: [Stable-10.2.2 45/53] linux-user: Deal with mmap where start > reserved_va Date: Wed, 11 Mar 2026 22:34:38 +0300 Message-ID: <20260311193449.1096110-45-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: 1773258236450158500 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 4bcfaf7894..281082c2d0 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -423,12 +423,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