From patchwork Fri Sep 6 11:13:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 825942 Delivered-To: patch@linaro.org Received: by 2002:adf:a345:0:b0:367:895a:4699 with SMTP id d5csp747270wrb; Fri, 6 Sep 2024 04:22:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2qLDc97bhWvXtP5X4JFqWPwg9fg8g6+z3ewzA/fx1k1Uu78o3y3vh9tvpbCLgrEyZTH7sOA==@linaro.org X-Google-Smtp-Source: AGHT+IGCyP+0wHNYJHS2Nnrxoiouw1A8+OCz1pHsWOAAV0G0baXi4cFSZMKZogYAMu98r08gpm2K X-Received: by 2002:a05:6214:5d8a:b0:6c3:5f8f:2745 with SMTP id 6a1803df08f44-6c528506eacmr27283136d6.27.1725621757156; Fri, 06 Sep 2024 04:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725621757; cv=none; d=google.com; s=arc-20240605; b=DvFUvEpsakweMyCVt7fROSNKr2IyX6kNLcHxSAzvBRsJ9t1rzf4h5tV8mYcnKC0BWt Ixk+csiScI1R7QzWsUEsV9owzocEj8OBJBhyxcHMRJ2dnF3AosqqAePqLLdUYaclK9HA mGgUG4mzpTBethJZThgV0twzTudTDWEadK6QLRLsrk/8TCso2AapLo72lE+iTLzGZqgn tR7mrbFeP6VyePEHkP1TOcnlVYOLUmqHActa9LD1uC4IshTH7v0f8meZp0fLLk4Yr3h8 4H/4ppmNehTT6Z5uh6Jmiw9Xec6z6s6NO+xJWflPn1tKbOT8AJsDmxk/QnX8CwDkg40+ X6Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=/YtHAho5vfNpliWF9E5Pr93sYum2HQ7bbExz/hkBmJ8=; fh=bMaafE1clBtiBaCrlbrbcY1DSEPhhFUklUk4XoVHiPU=; b=Ytk65CShEX4LTcTij9kKanXLk/+/kL+cDEO4H76+LggB6WrBsOokHur41jzgTZ5iMX 9C7twjxglLkEQYyTRxDa9hBMvwHYFiJdjiNP4YYvvSWrczeIol00hodE1yRD2cInWF6t ByckZ5SMBjJc8wS6gvK9nZc1fjgdtcT6gZ0Cw+dEAAzQ9t0nY2dlISFf/qs9hLP86Gxl JuRU+bBZOaDkUGlpPiEnpwksR4OuFKGiLGxB8SLI53gcF0EEfPLfBr0OOGyRrymvxgW6 KHIL/MnR9QppMCIav8TcbTrPR8/P3BIbfkkjjThZR6pGFlJ86hyllmlcij3/Yzn7Kqpy 7n5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c530674aa4si586686d6.398.2024.09.06.04.22.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Sep 2024 04:22:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smWze-0005MA-Oy; Fri, 06 Sep 2024 07:19:11 -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 1smWzW-0004gh-VA; Fri, 06 Sep 2024 07:19:02 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smWzU-0008Jr-R3; Fri, 06 Sep 2024 07:19:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 65C3A8C4AD; Fri, 6 Sep 2024 14:12:10 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 73E80133716; Fri, 6 Sep 2024 14:13:28 +0300 (MSK) Received: (nullmailer pid 353742 invoked by uid 1000); Fri, 06 Sep 2024 11:13:25 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev Subject: [Stable-9.0.3 60/69] linux-user: Preserve NULL hit in target_mmap subroutines Date: Fri, 6 Sep 2024 14:13:09 +0300 Message-Id: <20240906111324.353230-60-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Do not pass guest_base to the host mmap instead of zero hint. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2353 Signed-off-by: Richard Henderson (cherry picked from commit 3aefee3ec01e607529a9918e2978f365c5c3b5e9) Signed-off-by: Michael Tokarev diff --git a/linux-user/mmap.c b/linux-user/mmap.c index be3b9a68eb..2a11d921ab 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -559,9 +559,13 @@ static abi_long mmap_h_eq_g(abi_ulong start, abi_ulong len, int host_prot, int flags, int page_flags, int fd, off_t offset) { - void *p, *want_p = g2h_untagged(start); + void *p, *want_p = NULL; abi_ulong last; + if (start || (flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { + want_p = g2h_untagged(start); + } + p = mmap(want_p, len, host_prot, flags, fd, offset); if (p == MAP_FAILED) { return -1; @@ -609,11 +613,15 @@ static abi_long mmap_h_lt_g(abi_ulong start, abi_ulong len, int host_prot, int mmap_flags, int page_flags, int fd, off_t offset, int host_page_size) { - void *p, *want_p = g2h_untagged(start); + void *p, *want_p = NULL; off_t fileend_adj = 0; int flags = mmap_flags; abi_ulong last, pass_last; + if (start || (flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { + want_p = g2h_untagged(start); + } + if (!(flags & MAP_ANONYMOUS)) { struct stat sb; @@ -739,12 +747,16 @@ static abi_long mmap_h_gt_g(abi_ulong start, abi_ulong len, int flags, int page_flags, int fd, off_t offset, int host_page_size) { - void *p, *want_p = g2h_untagged(start); + void *p, *want_p = NULL; off_t host_offset = offset & -host_page_size; abi_ulong last, real_start, real_last; bool misaligned_offset = false; size_t host_len; + if (start || (flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { + want_p = g2h_untagged(start); + } + if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { /* * Adjust the offset to something representable on the host.