From nobody Thu Nov 12 10:23:47 2026 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 4jQGh34wXhz70Mwt for ; Thu, 12 Nov 2026 10:23:47 +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 4jQGh337s6z4GYN for ; Thu, 12 Nov 2026 10:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794479027; 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=YQrt28Qi8PwnDO4/8jNKrXiTqvEK12u5Ct1vX2oSq8Q=; b=VnhjpU1Xon+5pOJ/EsbNOViS0nR12RrPHsrGC218RKyaStz3Cvtfdmv2KqVWyVPKc9HVR9 Eqfamq48DV3wKeMgE/4mYD2o5rKy6yRxpBEOlaZc3lEWAkjc4vFQyWv51ZX+FnJbvKBW/M RqqshxTrf+T0cskLC/BCXfS0FRqNTMRK9d8+yBT6LKOGHmgVAu6DU4k4+AxS9cyAMpPn/v Ev7zJvsuj/1EdG+xLqi46DmxDRTgieGy7EW+XsqbGC3XKjBUsNhpNjbbYTw7t7i30NxMz6 pgCJXjW+vi5DhN78wuazshlJxm7EfTms2O29ivCVsueUbbGG+uIoacaiQweZpQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794479027; b=kVJZeWXhJee/E57Lr5ibfkpgsSR99trrNocPUld47ICHCog59h89RQtd9yE5o8riDhz5nT u3/fLxhQ8kDyxdCHZEr7PdsuU0vfOJdJfUhNuDtvSIYk3U8cYfh/Hs3r8q3MsTIsHDE8yb ZdpFdmSFKBgVvyy8zhvcs6gsA/9IPcYq7+IhLbtX7n/URLvXTtcIcvffCbclP/M8lIo26a 3aXr01YpdpI2YL6C5U6GLUq4604wrlzbCHwPSJMNuTzQfQDBmbYa0Pgrx1UBgvfBX/ECUq 2IruyfwEei6b2loCjOdRC6beQIHiBCNYAaWQAOxP1zMtIegYcesTgwKS8b3ezQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794479027; 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=YQrt28Qi8PwnDO4/8jNKrXiTqvEK12u5Ct1vX2oSq8Q=; b=GdAxGJfzCrbwO7APb//w+wjnA74bd5SFeU0nrXPa6/hO+VUr+ezoS46+fxUucH7cpmodhd BWPRMwXMLM9szULxpwnrfw3BhfTmi88JdK+HXekyI6hLnNfBcQ24pmz/3GV36SgxIfIjc5 ppud6zMoBXG1pWrQKFqgpaVXT4Ui30GuMw48jQ3Z39fLAa1MmDmmmtumPVOOmHsP29hdPt zlPdNTr6fC+xzNGAX4mXB4QPxw/NqdMVeUIdPU8mqJX5P0kYD0hrv8/qEhoIK4s3tvHX6C j0kNOHyjRaOM/mxNrovJnboGZ+IY5RhcRAoBXrPUwYSt5x9GdrWYoyVH8k+37A== 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 4jQGh32CGTzy2Q for ; Thu, 12 Nov 2026 10:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 10:23:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 87d8a910d30f - main - nmount(2): add kern_nmount List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87d8a910d30f88eb53dd00272aefb5dfc59e0d6b Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 10:23:47 +0000 Message-Id: <6af593b3.248a7.6754d44b@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=87d8a910d30f88eb53dd00272aefb5dfc59e0d6b commit 87d8a910d30f88eb53dd00272aefb5dfc59e0d6b Author: Brooks Davis AuthorDate: 2026-11-12 10:23:23 +0000 Commit: Brooks Davis CommitDate: 2026-11-12 10:23:23 +0000 nmount(2): add kern_nmount Effort: CHERI UK Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/vfs_mount.c | 18 ++++++++++++------ sys/sys/syscallsubr.h | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 69b448f8fe39..39c9135f3f4c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -435,10 +435,17 @@ struct nmount_args { #endif int sys_nmount(struct thread *td, struct nmount_args *uap) +{ + return (kern_nmount(td, uap->iovp, uap->iovcnt, uap->flags, + copyinuio)); +} + +int +kern_nmount(struct thread *td, struct iovec *iovp, u_int iovcnt, int flags32, + copyinuio_t *copyinuio_f) { struct uio *auio; int error; - u_int iovcnt; uint64_t flags; /* @@ -446,11 +453,11 @@ sys_nmount(struct thread *td, struct nmount_args *uap) * 32-bits are passed in, but from here on everything handles * 64-bit flags correctly. */ - flags = uap->flags; + flags = flags32; AUDIT_ARG_FFLAGS(flags); CTR4(KTR_VFS, "%s: iovp %p with iovcnt %d and flags %d", __func__, - uap->iovp, uap->iovcnt, flags); + (void *)iovp, iovcnt, flags); /* * Filter out MNT_ROOTFS. We do not want clients of nmount() in @@ -461,18 +468,17 @@ sys_nmount(struct thread *td, struct nmount_args *uap) */ flags &= ~MNT_ROOTFS; - iovcnt = uap->iovcnt; /* * Check that we have an even number of iovec's * and that we have at least two options. */ if ((iovcnt & 1) || (iovcnt < 4)) { CTR2(KTR_VFS, "%s: failed for invalid iovcnt %d", __func__, - uap->iovcnt); + iovcnt); return (EINVAL); } - error = copyinuio(uap->iovp, iovcnt, &auio); + error = copyinuio_f(iovp, iovcnt, &auio); if (error) { CTR2(KTR_VFS, "%s: failed for invalid uio op with %d errno", __func__, error); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 5c46451b516f..c8da8dc8300d 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -381,6 +381,8 @@ int kern_munlock(struct thread *td, uintptr_t addr, size_t size); int kern_munmap(struct thread *td, uintptr_t addr, size_t size); int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt); +int kern_nmount(struct thread *td, struct iovec *iovp, u_int iovcnt, + int flags32, copyinuio_t *copyinuio_f); int kern_nosys(struct thread *td, int dummy); int kern_ntp_adjtime(struct thread *td, struct timex *ntv, int *retvalp); int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap,