From nobody Wed Nov 11 13:21:03 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 4jPkg35v8vz70CHZ for ; Wed, 11 Nov 2026 13:21:03 +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 4jPkg30m9Zz4BsR for ; Wed, 11 Nov 2026 13:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794403263; 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=C2NpE1xr3L9G2ceIzVLjGTQKiwGpyysQS0CFeMfqNhI=; b=UTS6x7+ZzKorDIPaQGcv3ijzZGuxGW1wQmnD+BcSsN+8H23XI24V69vJqeLiXIGAXgx4vs n6LH/DBa2H9uuGmqPHBN47PrOJG1527dumiOQVM+tBI9DFCe2m+sbCudA7++1MRBY4jxec iJccvTcq2X7EsfnJkbH8TRaFSsAAh55F5rFix2aniq+5NwSiCQOLt8vZoxP83NFKBK23IK fuoZRZGbTHUwAyqLbHJmwj76j/01H5RZ+Q6Lnp1Q9STKkUP2Y81c9x1WYR/nhKeJKqirQF zOGoWJEumEsgRlAXlrGZfefMW295x3CBe3D4m1vCKbm0HwajBg4xUCksvO5wzg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794403263; b=RMUk52Uu0lllcxKeFqPVpXJss7fmYFlI4RmXcT0FSUjN4YbAmRneInd3xSgjqOb1qYj52a uIrH+xZUou4UhL7//hY3fRZqwt8YS8EZfvzBdLN+kztm77LPGexSjMMht2sCW525Qvy1VF fQs1Utt46Qy8RXP+f3rEs1AgRBExs+50ip56CzzonlWyyuWqiwyT8AS7Sm3RExLYZYe37p gyR9v7KAxLFGVZke4COXkXYlPvS4xMMWGj6ZHub6hXZVlbXdja8xDgTgznJhsHSymLWq0y xKgaADCxfIVAslBKJgGgFVD4a0g0wqFBEzJyYtI/ZmsD7nprX2z94tbBqpbl2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794403263; 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=C2NpE1xr3L9G2ceIzVLjGTQKiwGpyysQS0CFeMfqNhI=; b=AsGKybo05EQYLqffljsL/c65W1bWy3SyEFZY4bGFJUA0bxUQF1ZqOO9jvUdohRoySgQq51 68Gh1PlDK1vNHq2gQdlm/wZ74v6cUExrsiLnvY/dZVoNNLtDWaXOeYIZbTeKf7F2nGPWHW I7XHwpO/ehhCSiC6zJDiEQgCgFFZCa0npo3R1e7oNToubMTPvLAEm3EhszTuh22Tm89BrG 9KiG952PEM+lnqQaVslHTtVb8Wx5IEYtgkHcn54Sn+0ADuCSlVhoXEeY6ex0Nshe/6PdQ/ dZ6S4FHUWV0DKGab7CwPG5b+C2NxwfFxC9HYXi/78EblX8i0D7Ijctdgq3zAZg== 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 4jPkg30CGkzGGP for ; Wed, 11 Nov 2026 13:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 861e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 13:21:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 65e94d4621c8 - main - uipc_syscalls.c: add kern_ and user_ 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: 65e94d4621c811af607053ffeb7159456bd25f32 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 13:21:03 +0000 Message-Id: <6af46bbf.861e.618be4ff@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=65e94d4621c811af607053ffeb7159456bd25f32 commit 65e94d4621c811af607053ffeb7159456bd25f32 Author: Brooks Davis AuthorDate: 2025-11-25 22:32:53 +0000 Commit: Brooks Davis CommitDate: 2026-11-11 13:14:42 +0000 uipc_syscalls.c: add kern_ and user_ implementations Rename accept1 and sendit to user_accept and user_sendit. Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/uipc_syscalls.c | 131 ++++++++++++++++++++++++++++------------------- sys/sys/socket.h | 2 +- sys/sys/syscallsubr.h | 21 ++++++++ 3 files changed, 101 insertions(+), 53 deletions(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 133724ac76c5..8d8a777018e8 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -71,11 +71,8 @@ #include #include -static int sendit(struct thread *td, int s, struct msghdr *mp, int flags); static int recvit(struct thread *td, int s, struct msghdr *mp, void *namelenp); -static int accept1(struct thread *td, int s, struct sockaddr *uname, - socklen_t *anamelen, int flags); static int sockargs(struct mbuf **, char *, socklen_t, int); /* @@ -184,13 +181,20 @@ kern_socket(struct thread *td, int domain, int type, int protocol) int sys_bind(struct thread *td, struct bind_args *uap) +{ + return (user_bind(td, uap->s, uap->name, uap->namelen)); +} + +int +user_bind(struct thread *td, int s, const struct sockaddr *name, + socklen_t namelen) { struct sockaddr *sa; int error; - error = getsockaddr(&sa, uap->name, uap->namelen); + error = getsockaddr(&sa, name, namelen); if (error == 0) { - error = kern_bindat(td, AT_FDCWD, uap->s, sa); + error = kern_bindat(td, AT_FDCWD, s, sa); free(sa, M_SONAME); } return (error); @@ -239,13 +243,20 @@ kern_bindat(struct thread *td, int dirfd, int fd, struct sockaddr *sa) int sys_bindat(struct thread *td, struct bindat_args *uap) +{ + return (user_bindat(td, uap->fd, uap->s, uap->name, uap->namelen)); +} + +int +user_bindat(struct thread *td, int fd, int s, const struct sockaddr *name, + socklen_t namelen) { struct sockaddr *sa; int error; - error = getsockaddr(&sa, uap->name, uap->namelen); + error = getsockaddr(&sa, name, namelen); if (error == 0) { - error = kern_bindat(td, uap->fd, uap->s, sa); + error = kern_bindat(td, fd, s, sa); free(sa, M_SONAME); } return (error); @@ -254,7 +265,6 @@ sys_bindat(struct thread *td, struct bindat_args *uap) int sys_listen(struct thread *td, struct listen_args *uap) { - return (kern_listen(td, uap->s, uap->backlog)); } @@ -279,12 +289,9 @@ kern_listen(struct thread *td, int s, int backlog) return (error); } -/* - * accept1() - */ -static int -accept1(struct thread *td, int s, struct sockaddr *uname, socklen_t *anamelen, - int flags) +int +user_accept(struct thread *td, int s, struct sockaddr *uname, + socklen_t *anamelen, int flags) { struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; socklen_t addrlen; @@ -432,39 +439,44 @@ done: int sys_accept(struct thread *td, struct accept_args *uap) { - - return (accept1(td, uap->s, uap->name, uap->anamelen, ACCEPT4_INHERIT)); + return (user_accept(td, uap->s, uap->name, uap->anamelen, + ACCEPT4_INHERIT)); } int sys_accept4(struct thread *td, struct accept4_args *uap) { - if ((uap->flags & ~(SOCK_CLOEXEC | SOCK_CLOFORK | SOCK_NONBLOCK)) != 0) return (EINVAL); - return (accept1(td, uap->s, uap->name, uap->anamelen, uap->flags)); + return (user_accept(td, uap->s, uap->name, uap->anamelen, uap->flags)); } #ifdef COMPAT_OLDSOCK int oaccept(struct thread *td, struct oaccept_args *uap) { - - return (accept1(td, uap->s, uap->name, uap->anamelen, + return (user_accept(td, uap->s, uap->name, uap->anamelen, ACCEPT4_INHERIT | ACCEPT4_COMPAT)); } #endif /* COMPAT_OLDSOCK */ int sys_connect(struct thread *td, struct connect_args *uap) +{ + return (user_connectat(td, AT_FDCWD, uap->s, uap->name, uap->namelen)); +} + +int +user_connectat(struct thread *td, int fd, int s, const struct sockaddr *name, + socklen_t namelen) { struct sockaddr *sa; int error; - error = getsockaddr(&sa, uap->name, uap->namelen); + error = getsockaddr(&sa, name, namelen); if (error == 0) { - error = kern_connectat(td, AT_FDCWD, uap->s, sa); + error = kern_connectat(td, AT_FDCWD, s, sa); free(sa, M_SONAME); } return (error); @@ -535,15 +547,7 @@ done1: int sys_connectat(struct thread *td, struct connectat_args *uap) { - struct sockaddr *sa; - int error; - - error = getsockaddr(&sa, uap->name, uap->namelen); - if (error == 0) { - error = kern_connectat(td, uap->fd, uap->s, sa); - free(sa, M_SONAME); - } - return (error); + return (user_connectat(td, uap->fd, uap->s, uap->name, uap->namelen)); } int @@ -642,14 +646,21 @@ free1: int sys_socketpair(struct thread *td, struct socketpair_args *uap) +{ + return (user_socketpair(td, uap->domain, uap->type, uap->protocol, + uap->rsv)); +} + +int +user_socketpair(struct thread *td, int domain, int type, int protocol, + int *rsv) { int error, sv[2]; - error = kern_socketpair(td, uap->domain, uap->type, - uap->protocol, sv); + error = kern_socketpair(td, domain, type, protocol, sv); if (error != 0) return (error); - error = copyout(sv, uap->rsv, 2 * sizeof(int)); + error = copyout(sv, rsv, 2 * sizeof(int)); if (error != 0) { (void)kern_close(td, sv[0]); (void)kern_close(td, sv[1]); @@ -657,8 +668,8 @@ sys_socketpair(struct thread *td, struct socketpair_args *uap) return (error); } -static int -sendit(struct thread *td, int s, struct msghdr *mp, int flags) +int +user_sendit(struct thread *td, int s, struct msghdr *mp, int flags) { struct mbuf *control; struct sockaddr *to; @@ -805,12 +816,20 @@ bad: int sys_sendto(struct thread *td, struct sendto_args *uap) +{ + return (user_sendto(td, uap->s, uap->buf, uap->len, uap->flags, + uap->to, uap->tolen)); +} + +int +user_sendto(struct thread *td, int s, const char *buf, size_t len, int flags, + const struct sockaddr *to, socklen_t tolen) { struct msghdr msg; struct iovec aiov; - msg.msg_name = __DECONST(void *, uap->to); - msg.msg_namelen = uap->tolen; + msg.msg_name = __DECONST(void *, to); + msg.msg_namelen = tolen; msg.msg_iov = &aiov; msg.msg_iovlen = 1; msg.msg_control = 0; @@ -818,9 +837,9 @@ sys_sendto(struct thread *td, struct sendto_args *uap) if (SV_PROC_FLAG(td->td_proc, SV_AOUT)) msg.msg_flags = 0; #endif - aiov.iov_base = __DECONST(void *, uap->buf); - aiov.iov_len = uap->len; - return (sendit(td, uap->s, &msg, uap->flags)); + aiov.iov_base = __DECONST(void *, buf); + aiov.iov_len = len; + return (user_sendit(td, s, &msg, flags)); } #ifdef COMPAT_OLDSOCK @@ -838,7 +857,7 @@ osend(struct thread *td, struct osend_args *uap) aiov.iov_len = uap->len; msg.msg_control = 0; msg.msg_flags = 0; - return (sendit(td, uap->s, &msg, uap->flags)); + return (user_sendit(td, uap->s, &msg, uap->flags)); } int @@ -856,7 +875,7 @@ osendmsg(struct thread *td, struct osendmsg_args *uap) return (error); msg.msg_iov = iov; msg.msg_flags = MSG_COMPAT; - error = sendit(td, uap->s, &msg, uap->flags); + error = user_sendit(td, uap->s, &msg, uap->flags); free(iov, M_IOV); return (error); } @@ -880,7 +899,7 @@ sys_sendmsg(struct thread *td, struct sendmsg_args *uap) if (SV_PROC_FLAG(td->td_proc, SV_AOUT)) msg.msg_flags = 0; #endif - error = sendit(td, uap->s, &msg, uap->flags); + error = user_sendit(td, uap->s, &msg, uap->flags); free(iov, M_IOV); return (error); } @@ -1059,7 +1078,7 @@ recvit(struct thread *td, int s, struct msghdr *mp, void *namelenp) return (error); } -static int +int kern_recvfrom(struct thread *td, int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr) { @@ -1269,21 +1288,29 @@ kern_setsockopt(struct thread *td, int s, int level, int name, const void *val, int sys_getsockopt(struct thread *td, struct getsockopt_args *uap) +{ + return (user_getsockopt(td, uap->s, uap->level, uap->name, + uap->val, uap->avalsize)); +} + +int +user_getsockopt(struct thread *td, int s, int level, int name, void *val, + socklen_t *avalsize) { socklen_t valsize; int error; - if (uap->val) { - error = copyin(uap->avalsize, &valsize, sizeof (valsize)); + if (val != NULL) { + error = copyin(avalsize, &valsize, sizeof(valsize)); if (error != 0) return (error); } - error = kern_getsockopt(td, uap->s, uap->level, uap->name, - uap->val, UIO_USERSPACE, &valsize); + error = kern_getsockopt(td, s, level, name, val, UIO_USERSPACE, + &valsize); if (error == 0) - error = copyout(&valsize, uap->avalsize, sizeof (valsize)); + error = copyout(&valsize, avalsize, sizeof(valsize)); return (error); } @@ -1334,7 +1361,7 @@ kern_getsockopt(struct thread *td, int s, int level, int name, void *val, return (error); } -static int +int user_getsockname(struct thread *td, int fdes, struct sockaddr *asa, socklen_t *alen, bool compat) { @@ -1398,7 +1425,7 @@ ogetsockname(struct thread *td, struct ogetsockname_args *uap) } #endif /* COMPAT_OLDSOCK */ -static int +int user_getpeername(struct thread *td, int fdes, struct sockaddr *asa, socklen_t *alen, bool compat) { diff --git a/sys/sys/socket.h b/sys/sys/socket.h index cc910a2a8efa..cb95bd5dce11 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -114,7 +114,7 @@ typedef __uintptr_t uintptr_t; #define SOCK_CLOFORK 0x40000000 #ifdef _KERNEL /* - * Flags for accept1(), kern_accept4() and solisten_dequeue, in addition + * Flags for user_accept(), kern_accept4() and solisten_dequeue, in addition * to SOCK_CLOEXEC, SOCK_CLOFORK and SOCK_NONBLOCK. */ #define ACCEPT4_INHERIT 0x1 diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 0dbc81fd4ffb..794eaf58b618 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -420,6 +420,8 @@ int kern_rctl_remove_rule(struct thread *td, const void *inbufp, int kern_readlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, size_t count); int kern_readv(struct thread *td, int fd, struct uio *auio); +int kern_recvfrom(struct thread *td, int s, void *buf, size_t len, + int flags, struct sockaddr *from, socklen_t *fromlenaddr); int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); int kern_renameat(struct thread *td, int fromfd, const char *from, @@ -548,12 +550,20 @@ int kern_unmount(struct thread *td, const char *path, uint64_t flags); int user___specialfd(struct thread *td, int type, const void *req, size_t len); +int user_accept(struct thread *td, int s, struct sockaddr *uname, + socklen_t *anamelen, int flags); +int user_bind(struct thread *td, int s, const struct sockaddr *name, + socklen_t namelen); +int user_bindat(struct thread *td, int fd, int s, + const struct sockaddr *name, socklen_t namelen); int user_cap_ioctls_limit(struct thread *td, int fd, const u_long *ucmds, size_t ncmds); int user_cap_rights_limit(struct thread *td, int fd, cap_rights_t *rightsp); int user_clock_nanosleep(struct thread *td, clockid_t clock_id, int flags, const struct timespec *ua_rqtp, struct timespec *ua_rmtp); +int user_connectat(struct thread *td, int fd, int s, + const struct sockaddr *name, socklen_t namelen); int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, const struct cpuset_copy_cb *cb); @@ -564,8 +574,14 @@ int user_fspacectl(struct thread *td, int fd, int cmd, const struct spacectl_range *rqsrp, int flags, struct spacectl_range *rmsrp); int user_fstat(struct thread *td, int fd, struct stat *sb); +int user_getpeername(struct thread *td, int fdes, struct sockaddr *asa, + socklen_t *alen, bool compat); int user_getrlimitusage(struct thread *td, u_int which, int flags, rlim_t *ures); +int user_getsockname(struct thread *td, int fdes, struct sockaddr *asa, + socklen_t *alen, bool compat); +int user_getsockopt(struct thread *td, int s, int level, int name, + void *val, socklen_t *avalsize); int user_ioctl(struct thread *td, int fd, u_long ucom, void *udata, void *datap); int user_jail_get(struct thread *td, struct iovec *iovp, @@ -598,6 +614,9 @@ int user_sched_setscheduler(struct thread *td, pid_t pid, int policy, const struct sched_param *param); int user_select(struct thread *td, int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *utv); +int user_sendit(struct thread *td, int s, struct msghdr *mp, int flags); +int user_sendto(struct thread *td, int s, const char *buf, size_t len, + int flags, const struct sockaddr *to, socklen_t tolen); int user_setgroups(struct thread *td, int gidsetsize, const gid_t *gidset); int user_settimeofday(struct thread *td, const struct timeval *tv, const struct timezone *tz); @@ -610,6 +629,8 @@ 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_socketpair(struct thread *td, int domain, int type, int protocol, + int *rsv); 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,