From nobody Thu Nov 20 14:14:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 1763399465179966.6279724647702; Mon, 17 Nov 2025 09:11:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL2kk-0003lq-8L; Mon, 17 Nov 2025 12:10:58 -0500 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 1vL2kV-00039s-3h for qemu-devel@nongnu.org; Mon, 17 Nov 2025 12:10:44 -0500 Received: from mlugg.co.uk ([2001:19f0:7401:8244:5400:ff:fe24:ff33] helo=mail.mlugg.co.uk) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vL2kS-0006G4-8X for qemu-devel@nongnu.org; Mon, 17 Nov 2025 12:10:42 -0500 Received: from localhost.localdomain (3.c.0.2.2.e.e.a.9.8.5.7.2.1.b.b.f.b.9.2.0.c.b.a.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:abc0:29bf:bb12:7589:aee2:20c3]) by mail.mlugg.co.uk (Postfix) with ESMTPSA id 7BD8035A1C; Mon, 17 Nov 2025 17:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mlugg.co.uk; s=20200703; t=1763399430; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AWfnuXhrrYu4GZc3sZxhBSpbxAB6CnHusHek1i/jNVg=; b=FYdBPEJcKbnXiJhcEXI0LJL6vniHV2Nt4kDv6ogMZ56iavlFfeDnQv/SLFrMFaFugVI+DO JEk8SnFj5D9rccmcZ2iJr63JMbjHghSKngHci20tVUzzMBJyg2iMdQeKG8DQ5xO3G7UDQP oOPsWjQ7GOFowwFqy2C2AJLeRq03ULY= From: Matthew Lugg To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, peter.maydell@linaro.org, Matthew Lugg Subject: [PATCH v2 2/4] linux-user: fix mremap errors for invalid ranges Date: Mon, 17 Nov 2025 17:09:52 +0000 Message-ID: <20251117170954.31451-3-mlugg@mlugg.co.uk> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251117170954.31451-1-mlugg@mlugg.co.uk> References: <20251117170954.31451-1-mlugg@mlugg.co.uk> 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=2001:19f0:7401:8244:5400:ff:fe24:ff33; envelope-from=mlugg@mlugg.co.uk; helo=mail.mlugg.co.uk 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763399467810153000 Content-Type: text/plain; charset="utf-8" If an address range given to `mremap` is invalid (exceeds addressing bounds on the guest), we were previously returning `ENOMEM`, which is not correct. The manpage and the Linux kernel implementation both agree that if `old_addr`/`old_size` refer to an invalid address, `EFAULT` is returned, and if `new_addr`/`new_size` refer to an invalid address, `EINVAL` is returned. Signed-off-by: Matthew Lugg --- linux-user/mmap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Changes from last revision: the EINVAL case has been moved before the EFAULT case in accordance with Richard's feedback. diff --git a/linux-user/mmap.c b/linux-user/mmap.c index ef3833a2bb..6163f1a0d1 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -1110,12 +1110,15 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulon= g old_size, int prot; void *host_addr; =20 - if (!guest_range_valid_untagged(old_addr, old_size) || - ((flags & MREMAP_FIXED) && + if (((flags & MREMAP_FIXED) && !guest_range_valid_untagged(new_addr, new_size)) || ((flags & MREMAP_MAYMOVE) =3D=3D 0 && !guest_range_valid_untagged(old_addr, new_size))) { - errno =3D ENOMEM; + errno =3D EINVAL; + return -1; + } + if (!guest_range_valid_untagged(old_addr, old_size)) { + errno =3D EFAULT; return -1; } =20 --=20 2.51.2