From nobody Tue Nov 10 15:54:43 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 4jPB6r1FCcz6ygYW for ; Tue, 10 Nov 2026 15:54:44 +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 4jPB6q6jWgz4WZj for ; Tue, 10 Nov 2026 15:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794326083; 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=jbFiqMIpk7ofzTYG39UCOZlgidyXgmTP7Tfkc4qjKqw=; b=S/6U7dxZVuftLe2TtPwWnPe2cfMNLz3htWBOQAuL8f508/GCdPfx7Cy0q4RyPziB9mkqMF FBcs00W8fxbX8yisJNM26ybxRTLRmPKmohCFkRhKqpzoOsTKXe8TL7N2owrsaPTHscSVy/ Dkz9d8TLA0WYH2CM3jh/fZzBa/VVJ2onhJh8Tac5W3vsskmCZuhdiPkw35M9qJR2yTgLTN IO1McYdIv4vAjLMnxeuNLgx7ISALMrG60apZn+A2NFeLd9Ing/W57U5NKJiRe9O/Qz+A85 9Ja0hZ/oPJ8pGuEDySDcM3Voy0v9MjZHHyvxdPEhbmR17EQ//glileBIRCEBOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794326083; b=PrWaMPZl6xt4ANMD3XHp5omDUUJk4DORzjmFmESQuy1SpBU8hsdd3K7qhJDW5lt7NYil+r wzaS4OYiwlUf3zXWpqOTXoLEmVNhQ/AECi7vev3p+pmzDlEhor7qTAEoTeIPFJhestKpmg ckR2BqDVEAn+5PqAjKCx9E7Q63NS7JEgMRHs/sPZsHdSulGDaQaiAoc+u1wq/qMAhKIivc t7IWEDXJy2jhIG+71kXxjzYGQ91wpats//S2RqqIMzVDw8pj+rHaMSuxk8pYvMK+MbSKv1 TLEnlpVQEjO/j/BMk+WXwdezn5EKSl/HHsvgc8bmMjhPNnFHGBJ8tv5K5m8T9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794326083; 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=jbFiqMIpk7ofzTYG39UCOZlgidyXgmTP7Tfkc4qjKqw=; b=CDMZnJuttX0GHwjOXCcpEZdizWrDq6iFb5adZXVhOMw0Oj+kb8w5CtZJqLmGG7tY4Iqnh7 zt2gjwXpdJawtEpLIQ0b8BxsNF+U60FC+GWF+4+o0ltwV9PlSAV//EDzAnp0FwV8a0g3PS rpY+FDGiJpmF+BkEZivorBSlrlWd7pPlVvRDSnxAqL6/80jAqQSl14KkqYk57d4cHUgKug IHt6A1GhQtaxTuKJe2RcqV9EnrApTZGxAH4xlKUnEdTo4Ol7i8SSdSPpGHHo7CzmVZm3aJ IvtqaWmDiRcseu3XIF+5Otve6CKr5bvNgh8P/UT4lgmxcr1Qm5LitEEe3wrXwQ== 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 4jPB6q5wQxzbM9 for ; Tue, 10 Nov 2026 15:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a5ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 15:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3d101bbff45e - main - uuidgen(2): add user_ implementation 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: 3d101bbff45e53999418496807a51ee5da39d4f6 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 15:54:43 +0000 Message-Id: <6af33e43.a5ac.45281c0d@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3d101bbff45e53999418496807a51ee5da39d4f6 commit 3d101bbff45e53999418496807a51ee5da39d4f6 Author: Brooks Davis AuthorDate: 2025-11-24 16:02:36 +0000 Commit: Brooks Davis CommitDate: 2026-11-10 15:54:20 +0000 uuidgen(2): add user_ implementation Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_uuid.c | 13 +++++++++---- sys/sys/syscallsubr.h | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c index 136242ca2087..1eab13c23b9a 100644 --- a/sys/kern/kern_uuid.c +++ b/sys/kern/kern_uuid.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -175,9 +176,14 @@ struct uuidgen_args { #endif int sys_uuidgen(struct thread *td, struct uuidgen_args *uap) +{ + return (user_uuidgen(td, uap->store, uap->count)); +} + +int +user_uuidgen(struct thread *td, struct uuid *ustore, int count) { struct uuid *store; - size_t count; int error; /* @@ -186,13 +192,12 @@ sys_uuidgen(struct thread *td, struct uuidgen_args *uap) * like to have some sort of upper-bound that's less than 2G :-) * XXX probably needs to be tunable. */ - if (uap->count < 1 || uap->count > UUIDGEN_BATCH_MAX) + if (count < 1 || count > UUIDGEN_BATCH_MAX) return (EINVAL); - count = uap->count; store = malloc(count * sizeof(struct uuid), M_TEMP, M_WAITOK); kern_uuidgen(store, count); - error = copyout(store, uap->store, count * sizeof(struct uuid)); + error = copyout(store, ustore, count * sizeof(struct uuid)); free(store, M_TEMP); return (error); } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 200ed205557c..4b9000c6d39a 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -71,6 +71,7 @@ struct stat; struct thr_param; struct timex; struct uio; +struct uuid; struct vm_map; struct vmspace; @@ -560,6 +561,7 @@ int user_sigtimedwait(struct thread *td, const sigset_t *uset, void *info, int user_sigwait(struct thread *td, const sigset_t *uset, int *usig); int user_sigwaitinfo(struct thread *td, const sigset_t *uset, void *info, copyout_siginfo_t *copyout_siginfop); +int user_uuidgen(struct thread *td, struct uuid *ustore, int count); int user_wait6(struct thread *td, enum idtype idtype, id_t id, int *statusp, int options, struct __wrusage *wrusage, siginfo_t *sip);