From nobody Fri Aug 25 01:08:38 2023 X-Original-To: dev-commits-src-all@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 4RX1zp5Jlcz4qbDq; Fri, 25 Aug 2023 01:08:38 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RX1zp4Tvfz4Sxn; Fri, 25 Aug 2023 01:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6p4zaOMgpJrmexXFsYXPNBo85A1wEOk4nW28O+yqckU=; b=hMz7/P3l1fRVTclSAY2klZcA+Uz5G7S2Kh/xvZnP7RK1GYTBOMkqJazcPvvK/Gsj+jYGdq PWBaGr6uiCPcd8JvnIhPE7EqDMZJSVeLYJQ/yNt1bocq89t7YT3NDI/ASrrFCRW0v6Yj07 2g3T3/HaoLktaqct8imkoOPI01K5tsdq8I++IBh5N2u7xiPE2b5XoZCyPxdVOTmyhiwKDF b8kFqwnmn/mA8Jcd7Uii1hEFTMIvRpO9ttI2np185awRBYMG9gIjAZtdPq9WsvzCSjYGaa wJdSq0edBDkJgnZDkGD9Sx0MPkc1q+0K/y2ym/cFruWrNHKKCpNMWtdFplg4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692925718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6p4zaOMgpJrmexXFsYXPNBo85A1wEOk4nW28O+yqckU=; b=kpyjUJFrGstXHHL+BjQ7ovctVjyV4vooFgShmQb7QIWk1sIHjY258ovvjYC96jP4fp2JbN JKi47VsMzZT9/OsH4Ta279/6ujANNHU7sMvvwvhXIqBws0QVwK9xxbjj9WsQza2cC7OBLA /RlwM+bnuxyZ1ORiNhoTbRHJQjPnR+tibMM8O1w8uvZUojZ1zFlUG+n/uwtGzPG5jNY81H aem4vdpsq+LvlzPeYchi4qySN0+WQtqKHCy5Oi4xjc2B5T7pDkZoAJsxmNh1Ow2urqf9cw UkVZ+IMGqF7H2gfoO23TKhEKoPxY78luVglQ8v7jhkWxcgDnO9YppBpTwIZv3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692925718; a=rsa-sha256; cv=none; b=jykQIZ2ddwSjbJO01lF/Pz0re6SxFubtf6tfdDHoC9jgSAyyv0xB02fXvDRJU6rupWcmag xyrtyxbISUgU7cJkAKpQtlSuhCh7BpPYuMIus21pfrWqSNXszZtLiO2VOIzZ/2Y51O1RBG HpfVU5uBLWIeQQrt81KmwYsCQbSRMvDozKA5H+MskddR3awJZkuixQg6Eqk9v9rMI2x3Qj yESvKuZW5Oqctm5YbJdyPPQKYQa60rogFgY6SKnL/Pv3g+VT6dBwoa2EYB7YvJp6RoYoPE kzWDUEgsE3cWIaOngMhD8E3Q/MuUPTbzwCGt6f1r2eAGJ9mtkzq0qAN0cJ2x9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX1zp3QRtzplJ; Fri, 25 Aug 2023 01:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P18cox058551; Fri, 25 Aug 2023 01:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P18cN7058548; Fri, 25 Aug 2023 01:08:38 GMT (envelope-from git) Date: Fri, 25 Aug 2023 01:08:38 GMT Message-Id: <202308250108.37P18cN7058548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6283f6e79456 - stable/13 - linuxolator: implement Linux' PROT_GROWSDOWN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 6283f6e79456546e836442fc27d4c52e3cbc2134 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6283f6e79456546e836442fc27d4c52e3cbc2134 commit 6283f6e79456546e836442fc27d4c52e3cbc2134 Author: Konstantin Belousov AuthorDate: 2023-07-29 21:00:51 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-25 01:06:44 +0000 linuxolator: implement Linux' PROT_GROWSDOWN (cherry picked from commit 9b65fa69407808e710748875b0af98902110f128) --- sys/compat/cloudabi/cloudabi_mem.c | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/compat/linux/linux_mmap.c | 14 ++++++++++---- sys/sys/syscallsubr.h | 3 ++- sys/vm/vm_mmap.c | 9 +++++---- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/compat/cloudabi/cloudabi_mem.c b/sys/compat/cloudabi/cloudabi_mem.c index 0b721aea4016..dadf4058f30d 100644 --- a/sys/compat/cloudabi/cloudabi_mem.c +++ b/sys/compat/cloudabi/cloudabi_mem.c @@ -124,7 +124,7 @@ cloudabi_sys_mem_protect(struct thread *td, return (error); return (kern_mprotect(td, (uintptr_t)uap->mapping, uap->mapping_len, - prot)); + prot, 0)); } int diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index ac9486eb3f66..d708efcf91fe 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -480,7 +480,7 @@ freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap) prot |= PROT_EXEC; #endif return (kern_mprotect(td, (uintptr_t)PTRIN(uap->addr), uap->len, - prot)); + prot, 0)); } int diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 527bd3979584..d371c1b0935a 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -225,16 +225,22 @@ out: int linux_mprotect_common(struct thread *td, uintptr_t addr, size_t len, int prot) { + int flags = 0; - /* XXX Ignore PROT_GROWSDOWN and PROT_GROWSUP for now. */ - prot &= ~(LINUX_PROT_GROWSDOWN | LINUX_PROT_GROWSUP); - if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) + /* XXX Ignore PROT_GROWSUP for now. */ + prot &= ~LINUX_PROT_GROWSUP; + if ((prot & ~(LINUX_PROT_GROWSDOWN | PROT_READ | PROT_WRITE | + PROT_EXEC)) != 0) return (EINVAL); + if ((prot & LINUX_PROT_GROWSDOWN) != 0) { + prot &= ~LINUX_PROT_GROWSDOWN; + flags |= VM_MAP_PROTECT_GROWSDOWN; + } #if defined(__amd64__) linux_fixup_prot(td, &prot); #endif - return (kern_mprotect(td, addr, len, prot)); + return (kern_mprotect(td, addr, len, prot, flags)); } /* diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index d9cd3e7d7f3d..de3c7780fc2c 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -213,7 +213,8 @@ int kern_mmap_racct_check(struct thread *td, struct vm_map *map, vm_size_t size); int kern_mmap_maxprot(struct proc *p, int prot); int kern_mmap_req(struct thread *td, const struct mmap_req *mrp); -int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, int prot); +int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, + int prot, int flags); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index b1cc0741fddb..703078d81393 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -642,16 +642,17 @@ int sys_mprotect(struct thread *td, struct mprotect_args *uap) { - return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, uap->prot)); + return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, + uap->prot, 0)); } int -kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) +kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot, + int flags) { vm_offset_t addr; vm_size_t pageoff; int vm_error, max_prot; - int flags; addr = addr0; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) @@ -671,7 +672,7 @@ kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) if (addr + size < addr) return (EINVAL); - flags = VM_MAP_PROTECT_SET_PROT; + flags |= VM_MAP_PROTECT_SET_PROT; if (max_prot != 0) flags |= VM_MAP_PROTECT_SET_MAXPROT; vm_error = vm_map_protect(&td->td_proc->p_vmspace->vm_map,