From nobody Tue Apr 7 21:45:29 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=1773241957; cv=none; d=zohomail.com; s=zohoarc; b=PFR2DhPrQ74Kp2EVuPmuhbTPcPBy2GkpHv16ZEt4ZiN6+LoDmZLZb8wliYUGjvRWjoKcoTOwwESHcFbbu0dhhiUPra2Mo6jwcKulySZxnur3SN7PUiahfv7woxyBsq+MoJ+6YIQlPcn86qLuszktqtQ8VMKD/UJocHSAtVF2WVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773241957; 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=9YgBpCIkbqjD/Xzt6dhn/nMvXGPb6Htdj2WuzqR05NI=; b=QiJ1O9mYVzlxxZ6Q93jUK85r2LOX6UKshEWjlLXSkCc0x7q+AxUpLNdZGB5SOJVNDydeQD6aXXblkvZP4C4rtaPrgqhR9ZhjM8oWxl4Qt5WxI34exJ2z+Sq7VOA/BS/48Nar2OznlNkIiEuIv9n4Xabeu4eGAfxIe6LHpIdY7CY= 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 1773241957751758.0671337845107; Wed, 11 Mar 2026 08:12:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LBX-00008L-EE; Wed, 11 Mar 2026 11:09:21 -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 1w0L8J-0002Zh-BG; Wed, 11 Mar 2026 11:06:00 -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 1w0L8H-0004lp-FJ; Wed, 11 Mar 2026 11:05:59 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 276FF191E65; Wed, 11 Mar 2026 18:01:46 +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 15F9E37C2B7; Wed, 11 Mar 2026 18:02:24 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241306; bh=BHOviuHP5foff2AjkdUA6ZMcXXULNC4ThKsRfXFMgTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sRq1knxVrwotdFEZOi5uNY+GVfsZPuLFYT4Dyjlh9FRYWwcvprhDLdfjD/nsqgREr qYLgtWby8CXrKWKOJrzPdlbPYQqjlZBiS1odKftr8CLGeylGZOIhssvybcneYE6kHz 65c9KB+a18cYBdgR0WB/oFrkdarJSgat4FghHYNOKsdL+9XAMRJRpK9SYpBAVJk8DC L/pgMWHPN0XF7wQeeeW0XPwbLhNSpxb/SS2OQ7t5Pd+MNjtkJ3NpT+57asWbIghcgU xOkDHF/Q6SyftNz0cLNz2m+fx0HKmHySonnRLR8uZqaQOJFwwkDQqY3CsHgQWRRmqE 2L8AmcTP7bauA== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Bingwu Zhang , Helge Deller , Warner Losh , Michael Tokarev Subject: [Stable-10.0.9 39/44] bsd-user: Deal with mmap where start > reserved_va Date: Wed, 11 Mar 2026 18:02:11 +0300 Message-ID: <20260311150221.1084186-39-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: 1773241959797158500 Content-Type: text/plain; charset="utf-8" From: Bingwu Zhang Fixes: f12294b5bd21 ("bsd-user: Use page_find_range_empty for mmap_find_vma= _reserved") Signed-off-by: Bingwu Zhang Reviewed-by: Helge Deller Reviewed-by: Warner Losh Signed-off-by: Helge Deller (cherry picked from commit e8e7d1f97785be2fd81fc520e0c7b9d228c10a56) Signed-off-by: Michael Tokarev diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 3f0df79c37..00305463e6 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -257,12 +257,14 @@ abi_ulong mmap_next_start =3D TASK_UNMAPPED_BASE; static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size, abi_ulong alignment) { - abi_ulong ret; + abi_ulong ret =3D -1; =20 - ret =3D page_find_range_empty(start, reserved_va, size, alignment); + if (start <=3D reserved_va) { + ret =3D page_find_range_empty(start, reserved_va, size, alignment); + } if (ret =3D=3D -1 && start > TARGET_PAGE_SIZE) { /* Restart at the beginning of the address space. */ - ret =3D page_find_range_empty(TARGET_PAGE_SIZE, start - 1, + ret =3D page_find_range_empty(TARGET_PAGE_SIZE, MIN(start - 1, res= erved_va), size, alignment); } =20 --=20 2.47.3