From nobody Wed Nov 11 13:21:01 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 4jPkg24XsHz70CHY for ; Wed, 11 Nov 2026 13:21:02 +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 4jPkg20fT2z4C9Z for ; Wed, 11 Nov 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794403262; 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=lzXrvcjk1PGT7ksYrgSZIV77M1nOXIcYpBNRp6EEwWA=; b=sIEtvMJXzdb12FtwV4DcKHmsZeomN/A5f1G8uWi/g/EefjOjLgPk65s5jKD3wfhjADEZrL 1HtxTEIJUeEn9qtiY/rnrZxxmcSKW/8URUGGFje/tv4+rbcdOlok64FLiX1voSUKdgZPOV FeReFUr79A1F0BVpljId7z0De6yaAUmezxmAzrtC0Ts/9IwPyncVXt2hwiZlBdEN6fLucp OlHDjQ/SKMrghcxQ2H7N3Yfkgk/Apk5QPcuc8dEpxIJwCb0F05KCqkCNWGQnkGhe2GM31f s5TEvYWu/7YR48lPxFO0JcWHUdlZBygcMx5RxLMenbNl4Rf6wGmkTMbfSFwThA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794403262; b=aFmvL0YqbJoVI01uk9vq73eUfq56LA8LOG3AUcbxqRsimlpMVcpaZ07rn5hxFgetSe3Ii7 7bg9v8gWfyS756RbBBLRRk/lzhC4ViFHgq/LrY7cRh1ltaSw8fav9N+f9tokw/IuqfvqBe VrA7shkaElst/tsh96Z46jWb524MAU7XfdVkIdhIOXSnUmpnkoUf7YdXRK3k7J29I1xPFH mpcQvdkYaxZgXv90p8BA+2xe5aRvtz03wO5dN1kPgq8YTxG3m71PI4EA5S3pF/rt9b4SUo VWcMF5NYYgLoAjpfmsA4IfLhAVggDjyla9MgF1IhBU10uhkcWdYc8lBjVS2Xfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794403262; 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=lzXrvcjk1PGT7ksYrgSZIV77M1nOXIcYpBNRp6EEwWA=; b=GbeR7CSj6c3u7gj/zijWAyi9+JVoy0DN3/U5swbkI1739SLpMSuYu6wEVDMSk48UeTumbR 8NIxhF3eUWFusl89YwLemm1NFadHajWDvjIydHVgiJNFvN8i5JMGknyepYjasw1OQmldNY xxJS60X43jHJAAnND3lgyQxog13BmnUjY1Q5QInOc6+yaqnaWqCp3dbCIZ5WMD+KOHKrLo oqo6o6TKyTTu0QZWx4ssdJCsUhmZ+l0+kkVcc9HfFjiAjlByavHNeMqzdHCbQZgfCV7Rbp fkGBkBlO8loP61vuVXAyeY3i3Pvi7SbN/sSC+DIOe+zzU7MYsi0uy4w6O1dkTw== 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 4jPkg16tW9zGl6 for ; Wed, 11 Nov 2026 13:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 712a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 13:21:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0e100820c4bb - main - uipc_shm.c: add kern_ implementations 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: 0e100820c4bb87dc3c365fa1f6a16e6f84363f5b Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 13:21:01 +0000 Message-Id: <6af46bbd.712a.18a0dffa@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0e100820c4bb87dc3c365fa1f6a16e6f84363f5b commit 0e100820c4bb87dc3c365fa1f6a16e6f84363f5b Author: Brooks Davis AuthorDate: 2025-11-24 18:14:57 +0000 Commit: Brooks Davis CommitDate: 2026-11-11 13:14:42 +0000 uipc_shm.c: add kern_ implementations Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/uipc_shm.c | 23 +++++++++++++++++------ sys/sys/syscallsubr.h | 3 +++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 3544ebd35336..eefe6a63b53c 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1407,12 +1407,18 @@ freebsd12_shm_open(struct thread *td, struct freebsd12_shm_open_args *uap) int sys_shm_unlink(struct thread *td, struct shm_unlink_args *uap) +{ + return (kern_shm_unlink(td, uap->path)); +} + +int +kern_shm_unlink(struct thread *td, const char *userpath) { char *path; Fnv32_t fnv; int error; - error = shm_copyin_path(td, uap->path, &path); + error = shm_copyin_path(td, userpath, &path); if (error != 0) return (error); @@ -1428,15 +1434,20 @@ sys_shm_unlink(struct thread *td, struct shm_unlink_args *uap) int sys_shm_rename(struct thread *td, struct shm_rename_args *uap) +{ + return (kern_shm_rename(td, uap->path_from, uap->path_to, uap->flags)); +} + +int +kern_shm_rename(struct thread *td, const char *path_from_p, + const char *path_to_p, int flags) { char *path_from = NULL, *path_to = NULL; Fnv32_t fnv_from, fnv_to; struct shmfd *fd_from; struct shmfd *fd_to; int error; - int flags; - flags = uap->flags; AUDIT_ARG_FFLAGS(flags); /* @@ -1462,16 +1473,16 @@ sys_shm_rename(struct thread *td, struct shm_rename_args *uap) } /* Renaming to or from anonymous makes no sense */ - if (uap->path_from == SHM_ANON || uap->path_to == SHM_ANON) { + if (path_from_p == SHM_ANON || path_to_p == SHM_ANON) { error = EINVAL; goto out; } - error = shm_copyin_path(td, uap->path_from, &path_from); + error = shm_copyin_path(td, path_from_p, &path_from); if (error != 0) goto out; - error = shm_copyin_path(td, uap->path_to, &path_to); + error = shm_copyin_path(td, path_to_p, &path_to); if (error != 0) goto out; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 0068f5c16cbc..0dbc81fd4ffb 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -475,6 +475,9 @@ int kern_shm_open2(struct thread *td, const char *path, int flags, const char *name, struct shmfd *shmfd); int kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg); +int kern_shm_rename(struct thread *td, const char *path_from_p, + const char *path_to_p, int flags); +int kern_shm_unlink(struct thread *td, const char *userpath); int kern_shmctl(struct thread *td, int shmid, int cmd, void *buf, size_t *bufsz); int kern_shutdown(struct thread *td, int s, int how);