From nobody Sat Oct 24 02:31:05 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jBP5V4HP7z6wx61 for ; Sat, 24 Oct 2026 02:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jBP5V2zt5z4Yr6 for ; Sat, 24 Oct 2026 02:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792809070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBIWRnjIIq+USktusXoTmtDL34IqN7naUiurp+9x88U=; b=xrGBbE+Gj22gX9PdhqxPXATIlhDYXve055PxhP1L2ijqbHtcjRtco+0nwrW6yGpTimY6ir +EqnAED2pwlKBZMehMK21S7yVo3SIFuglAo8tIN4925nm7ZoaUUEL1xSxMDmQl0usF2ePt qJKDy6hiV6jnLRB6TnAqdQQ7AoEkqBA9ASYXvupPap2itBb/bNvuCKhxQwn3fGng2AFjhm oYWcG1FTYEojmVQbOeti/18G5B65+WFiEzQEr2UDvkL0LhjHlxnuARSrhBczaDbnAMBO23 D7UrcRKgaiga7xYcpLJSdBCv/fq2veeiAMQyJLJLUTYVMoJefQkoQPjN9Vm3qw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792809070; b=FWl60nKH0OGgwDFo961LdXv4esNuGXDRTNmx/S+EqTcEuAvfJIGqCigxTV85EnNGOzNQgr tvJwNZsj0DolknQIyYnY1RELhXaSvOwWo9TwSdhlAJtIDHM1qH1MRi8SXGXFM8dZHiWKxq dvb+39g7COuHQGQ7uXt/vaeTfNbpHC8dx2XWC8OGZBmSG7ZOf9Lr+A1dRGo8+KPBWwhIHt 4CKo5E0sZOGs9dZH9LhNR8Xbrb7qkBC9WtY/S+H1kVqQm1/xuSTrHJ4XFSiioJG0Z2Ygm4 BzV/6WnOSrpAmjdo7JvPPOHtLneBOe28ZeJaet84czmiuIU6AKSCP6DetUHl4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792809070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pBIWRnjIIq+USktusXoTmtDL34IqN7naUiurp+9x88U=; b=tMmUE+SVTSpSQqZYz2sKCd6oTLZ5j0ZQUeTozOEgxrsyxEq5Fd5T/3X0z5D5RFq5TcgpsV VBQGWV+Utol9fopCMwxEtEqsVdxU7lUxCv1rDfckQgphUA/RADpKRBkweXoxVWxyDw8Sfn Kn/V3MB+CseOvwVSRBkR3Sk2tN+P1/VUgZd0B8m3ULR+HlxXDl9NfNv3tLM+Kxv/TF8vHQ dNafGApK/KKaVEb2ykQGjpKJPCjMf+cEGyVFDcWMvn6cw1QcnVw6OCk9GRQPRRLJf3FctI NzVfCNo8LW9++6Xl1VyMH8TRO+6LB8snCEvcpmuPg7HwZ3l9+sX7x8nJM+Tobw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jBP5V2WBxzxl6 for ; Sat, 24 Oct 2026 02:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3273e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Oct 2026 02:31:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Joy From: Konstantin Belousov Subject: git: 9a8d5af1ba01 - main - linux: correct errors from mremap(2) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a8d5af1ba0174ec5fcc3eedba545aec9a627987 Auto-Submitted: auto-generated Date: Sat, 24 Oct 2026 02:31:05 +0000 Message-Id: <6adc1869.3273e.3a16a4cb@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9a8d5af1ba0174ec5fcc3eedba545aec9a627987 commit 9a8d5af1ba0174ec5fcc3eedba545aec9a627987 Author: Joy AuthorDate: 2026-10-24 02:22:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-24 02:24:19 +0000 linux: correct errors from mremap(2) Linux returns EFAULT when the range to be remapped is not mapped at all, and ENOMEM only when it is mapped but cannot be grown in place. Callers depend on that distinction: musl's pthread_getattr_np() measures the main thread stack by growing a one page mapping and retries while errno is ENOMEM. Returning ENOMEM for every growth request makes that loop spin forever. PR: 299835 MFC after: 1 week --- sys/compat/linux/linux_misc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index e9441a31e8ac..09b41bf37a92 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -64,6 +63,7 @@ #include #include +#include #include #include @@ -362,7 +362,10 @@ linux_mremap(struct thread *td, struct linux_mremap_args *args) if (args->new_len > args->old_len) { td->td_retval[0] = 0; - return (ENOMEM); + if (useracc((void *)(uintptr_t)args->addr, args->old_len, + VM_PROT_READ)) + return (ENOMEM); + return (EFAULT); } if (args->new_len < args->old_len) {