From nobody Sat Oct 31 03:18:50 2026 X-Original-To: dev-commits-src-branches@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 4jGjqN1ZVmz6xqM1 for ; Sat, 31 Oct 2026 03:18:56 +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 4jGjqN0bKCz570w for ; Sat, 31 Oct 2026 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416736; 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=u+1BlJd7pEL7mJxUHHA6GYg9DFh11o+E+FqLAijyAgw=; b=g5DxJc8wm0pYpX6lCcaW2SBQ1s3iC3nheX3Jc0TL4voDfJECAd6339sNzEEMXNZua5MUrB QcCaihp8hKeww05cdd68JkCk4mZZ/7LKfLCV6UlYfCwrfVH7lWe9FlLMqCopUasnV9nNl8 Fi+GDJ9uzPQDAtaQFE8svibZruxTbXFx+eIDJ6f0xgScZ2dEvo2MTaonP73AXA3U7hWalS Q7UvCFxc55b2X4et51/TCyWZI3vOZ9oEfAJTDL/2lMLFj3uLmeKOVCB+enqbR7TBLndFSM EW4MRtkjrvUCaoZ9zRJQ6U8rh6CmjDokyk8jvqhazg9ZPLG49gr46o2ED8JgQA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793416736; b=ompNOXIjw+AIguJLXmThFqBRJ7IX8fa+VtcuKpZyJ8JxpMOy2zcyPJg8Hcu+A4XOBP9yHa zRgAM6wy7Q3o2nznX9LRcdt4jopQWRn6Dv6xMoV9WgToEsWp5kU8J8HUqYpGx7LYpCaPWR uB5YUi/oTWIgonZSuoEpnISlsp5D/LD4j+u7p1UtPJvOKRiUFexsnym4aTJjCLBbBfb9In 4W+zw1uwKum/Ek8XIhtV8RdwnqLOJLTLfchU83+bl5HnruM+7nxd+UlaxMAsifcVuppds7 LC95tzCtpBlhERzaXyngeV6gJhyhM0ulBcm7o4tmKkqG1XbHjdzyJzYYo+FxIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416736; 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=u+1BlJd7pEL7mJxUHHA6GYg9DFh11o+E+FqLAijyAgw=; b=naVa+a94bDyfX6ktO621SHV5l6e70X+ox6Wx2vxT1XRIXWPJJqelPfNjKFETwnHnLUP58Z 1AtnRVVrwfyCrl3qV/SD4h13e0AEwZNAmK7UzX+UggEEZVfL5XBoCJ2dLwwNi/1GcSocPG 0sRjnMUTmqr5IiahYiTMyem64SyA2K5SzSn6JkouLSVDFMc1Yuju4SM4BVx4HBzJzEgR21 hfxfCkOvbyUHRo7/SF6qZQ2ImezFcaqGgAIOYuVttj6UpR3QR7zzslRo8o1xVnp4zb9pxY jdhWJ/2NJyzhvKSqdpYotpiNRn7FYbVK/f2mv+KjQFYNQfd1MjoWHmxKxo50qQ== 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 4jGjqN0FtGzwNj for ; Sat, 31 Oct 2026 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ff7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 03:18:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Joy From: Konstantin Belousov Subject: git: 42094ab41e5a - stable/15 - linux: correct errors from mremap(2) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 42094ab41e5ad34b56603fa343ba53f93c7f4984 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 03:18:50 +0000 Message-Id: <6ae55e1a.33ff7.189c6b49@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42094ab41e5ad34b56603fa343ba53f93c7f4984 commit 42094ab41e5ad34b56603fa343ba53f93c7f4984 Author: Joy AuthorDate: 2026-10-24 02:22:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-31 03:15:21 +0000 linux: correct errors from mremap(2) PR: 299835 (cherry picked from commit 9a8d5af1ba0174ec5fcc3eedba545aec9a627987) --- sys/compat/linux/linux_misc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index de40449e6f15..604453e48285 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -62,6 +62,7 @@ #include #include +#include #include #include @@ -325,7 +326,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) {