From patchwork Tue Jun 30 10:34:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 192061 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3690146ilg; Tue, 30 Jun 2020 03:35:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzOKHOojmGckH08qUpRqq9DaXiZwC//xvHBwXH82OxoOaS2eZflFEjuLkoYnigLOed7qHF X-Received: by 2002:a25:ad5a:: with SMTP id l26mr31618408ybe.188.1593513345718; Tue, 30 Jun 2020 03:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593513345; cv=none; d=google.com; s=arc-20160816; b=I/SaqamNiq21Knl732+8EP/OLdFFWK5ayDgC8K5jLla04qT+86903opvUgTRhasPy7 nEhYHoTo97/SJFViy72h1DC8NbNEy5ZwNHNYMlqOFvDM1A0t2RNUSu69+Xb7fvtprMKz g4sIFXwQDRKs4aQ6FtXJEAq/WOKgx3RXzQZgKW6i5jzH/jqfgLd5mY9yxTRfySgl4RwO wBxrTfDeHdg+iyulED33VuoUNsDi/0U+jVE+ladCHeY7IrLaBH4jdFN9WvCTzPn2jEK9 VvH6RH01MZ5XECvWtGr6HRNwWgct7zN/JF613ruBNxSeqMUJXmTzP/GBSc58pKczkVoo XNfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=GDR6ape9ULFXd9AXd8i0jKbRDr4t91uOPO8xiLTtEMg=; b=yPXjCLpIZBopwY+CXxMdMp8SkRymc9EeUQpOUG0cQfYT21MoDHBcOzarzXj2xIpzaM kE5zCVrDcbuMjTsacSOg0BhphwjVNqHj2E4dOg6AhpH9xTg+gFLCms1z1xtjXb3YnpBg rhH0s8Cw48InPPTlHSYJDWd4TrUJqSrUxDcECfcx8ZyRGWeIR0XSgarMI5rXJgJzKkGk cjyDjpVp+yQm/ChNiu9+dEr+thkNmTA5+GGSXUvMm3n5mFYSY34VYq2lovj7sIVSxj5s 4xdrb0rTfuVZb+FPA2pRxikeOERCDN6XHnUbGh1l/Rkw4m8NUX5TjbM9GoImRqDR5lf1 LdDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kNvFppDH; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w77si2610039ybe.432.2020.06.30.03.35.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jun 2020 03:35:45 -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; dkim=fail header.i=@linaro.org header.s=google header.b=kNvFppDH; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqDc9-000263-72 for patch@linaro.org; Tue, 30 Jun 2020 06:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqDbN-00023z-UU for qemu-devel@nongnu.org; Tue, 30 Jun 2020 06:34:58 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqDbM-0001dL-AD for qemu-devel@nongnu.org; Tue, 30 Jun 2020 06:34:57 -0400 Received: by mail-wm1-x343.google.com with SMTP id w3so6627994wmi.4 for ; Tue, 30 Jun 2020 03:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GDR6ape9ULFXd9AXd8i0jKbRDr4t91uOPO8xiLTtEMg=; b=kNvFppDHSgN+hrqF2l1GkxZTfStYLb2U/LoFBsMhpFzIbcFrBCKH3tgVsuWCov29hj UrNWt6MJACXctTRAfuRl3MK2Vok41hBsnX1qzbc6uj0yze/TYPpVa0X/Wusq+SIQnrC0 wOZ4WAYuduKueIIoO0KIIsQGaR09PhhjfBjjLXRAqxK9uzJeR0UZbmfO82/UZwOvUi7T +g1SfMwTzgtUZZCqWWFu+LdYVcOTZ+P442uEpS892qReAbL6Cx+6eg1oIiwEAPpu2Zmp YgG0jO7dylL21uZL4jVbBWzDZ39FmDqSWHCJ0yDmDXwy1tgSjK0WL2oJMyLTYCMY4PFj +gXA== 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:mime-version :content-transfer-encoding; bh=GDR6ape9ULFXd9AXd8i0jKbRDr4t91uOPO8xiLTtEMg=; b=EaqVoKE2w2E64iKolB3EzFXt4K3Z80B4Hiaqo1lo9NKXzg9dC0RmgqC/f+Foat86Ti ia2ukHGf1lVQsX38rtAr+gCptP7cKzEvmdW66n0G58eFzK47DbEundhYDkETXAX9PlJ4 IwzD300O9z+bOgfd/HNdLHx370N+y42hlJLNMiOxQG9kzcowfK7z7Qw30xT0xI9UA7Jq Iae4iQ4V/pQdjWd4cFInEyUQZ6rOPNar8o/E6ChJLlfGwUOYxf39caXWhvfVKaEYv+0V 950AaeHWrrF/NLGwk7glvLt0rIMS8J3+W3PAnzhghqfilkw4OXq7ve9Q4USsI1wwjZnf R6oQ== X-Gm-Message-State: AOAM531dQncMXixSjVsuaHpNE7/w07GmuKSt+vzgI3W3UcUXbHUA55sz did/mca95bJsulOuq0t0zuRSKw== X-Received: by 2002:a1c:bb43:: with SMTP id l64mr21506440wmf.151.1593513294114; Tue, 30 Jun 2020 03:34:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k185sm3178123wmk.47.2020.06.30.03.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 03:34:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C9C21FF7E; Tue, 30 Jun 2020 11:34:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH] linux-user/elfload: use MAP_FIXED in pgb_reserved_va Date: Tue, 30 Jun 2020 11:34:48 +0100 Message-Id: <20200630103448.22742-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Riku Voipio , richard.henderson@linaro.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Given we assert the requested address matches what we asked we should also make that clear in the mmap flags. Otherwise we see failures in the GitLab environment for some currently unknown but allowable reason. Signed-off-by: Alex Bennée --- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b5cb21384a1..be8facfbcc8 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2294,7 +2294,7 @@ static void pgb_dynamic(const char *image_name, long align) static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr, abi_ulong guest_hiaddr, long align) { - const int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE; + const int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | MAP_FIXED; void *addr, *test; if (guest_hiaddr > reserved_va) {