diff options
Diffstat (limited to 'src/sys/include')
-rw-r--r-- | src/sys/include/compat/unix/syscall.h | 7 | ||||
-rw-r--r-- | src/sys/include/os/filedesc.h | 24 | ||||
-rw-r--r-- | src/sys/include/os/ucred.h | 61 | ||||
-rw-r--r-- | src/sys/include/os/vnode.h | 7 | ||||
-rw-r--r-- | src/sys/include/sys/proc.h | 2 | ||||
-rw-r--r-- | src/sys/include/sys/socket.h | 83 | ||||
-rw-r--r-- | src/sys/include/sys/syscall.h | 3 | ||||
-rw-r--r-- | src/sys/include/sys/types.h | 1 | ||||
-rw-r--r-- | src/sys/include/sys/ucred.h | 48 |
9 files changed, 233 insertions, 3 deletions
diff --git a/src/sys/include/compat/unix/syscall.h b/src/sys/include/compat/unix/syscall.h index 42dc4c0..9b76139 100644 --- a/src/sys/include/compat/unix/syscall.h +++ b/src/sys/include/compat/unix/syscall.h @@ -31,9 +31,11 @@ #define _UNIX_SYSCALL_H_ 1 #include <sys/proc.h> +#include <sys/socket.h> #include <sys/param.h> #include <sys/mount.h> #include <sys/syscall.h> +#include <os/ucred.h> #include <os/iotap.h> #include <os/reboot.h> #include <dms/dms.h> @@ -95,7 +97,10 @@ scret_t(*g_unix_sctab[])(struct syscall_args *) = { [SYS_dmsio] = sys_dmsio, [SYS_read] = sys_read, [SYS_close] = sys_close, - [SYS_lseek] = sys_lseek + [SYS_lseek] = sys_lseek, + [SYS_socket] = sys_socket, + [SYS_listen] = sys_listen, + [SYS_seteuid] = sys_seteuid }; #endif /* !_NEED_UNIX_SCTAB */ diff --git a/src/sys/include/os/filedesc.h b/src/sys/include/os/filedesc.h index b773de9..95400ed 100644 --- a/src/sys/include/os/filedesc.h +++ b/src/sys/include/os/filedesc.h @@ -52,6 +52,18 @@ struct filedesc { }; /* + * Allocate a file descriptor from a specific process's + * file descriptor table + * + * @procp: Process to allocate fd from + * @fd_res: Result pointer is written here + * + * Returns zero on success, otherwise a less than + * zero value upon failure + */ +int fd_alloc(struct proc *procp, struct filedesc **fd_res); + +/* * Duplicate a file descriptor * * @procp: Process to duplicate from @@ -63,6 +75,18 @@ struct filedesc { struct filedesc *fd_dup(struct proc *procp, int fd); /* + * Look up a file descriptor that belongs to a specific + * process by using its fd number + * + * @procp: Process to look up + * @fd: File descriptor number + * + * Returns the file descriptor pointer on success, + * otherwise a less than zero value on failure + */ +struct filedesc *fd_get(struct proc *procp, int fd); + +/* * Initialize a process file descriptor table * and set up standard streams * diff --git a/src/sys/include/os/ucred.h b/src/sys/include/os/ucred.h new file mode 100644 index 0000000..6e3e4b4 --- /dev/null +++ b/src/sys/include/os/ucred.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_UCRED_H_ +#define _OS_UCRED_H_ 1 + +#include <sys/syscall.h> +#include <sys/types.h> +#include <sys/ucred.h> +#include <sys/proc.h> + +/* + * Initialize user credientials + * + * @proc: Current process + * @cred: credientials to initialize + * + * XXX: 'proc' being NULL drops the creds to root + * + * Returns zero on success, otherwise a less + * than zero value on failure. + */ +int ucred_init(struct proc *proc, struct ucred *cred); + +/* + * Set effective user ID + */ +int seteuid(uid_t euid); + +/* + * Set EUID system call + */ +scret_t sys_seteuid(struct syscall_args *scargs); + +#endif /* !_OS_UCRED_H_ */ diff --git a/src/sys/include/os/vnode.h b/src/sys/include/os/vnode.h index 77cadb2..8cdcded 100644 --- a/src/sys/include/os/vnode.h +++ b/src/sys/include/os/vnode.h @@ -44,12 +44,14 @@ struct vop; * @VTYPE_NONE: Vnode is yet to be assigned a type * @VTYPE_FILE: Vnode references a file * @VTYPE_DIR: Vnode references a directory + * @VTYPE_SOCK: Vnode references a socket * @__N_VTYPE: Number of valid nodes on the system */ typedef enum { VTYPE_NONE, VTYPE_FILE, VTYPE_DIR, + VTYPE_SOCK, __N_VTYPE } vtype_t; @@ -88,9 +90,11 @@ struct vop_rw_data { * filesystem * * @ndp: Path component to create + * @vtype: Vnode type */ struct vop_create_args { struct nameidata *ndp; + vtype_t vtype; }; /* @@ -204,11 +208,12 @@ int vop_reclaim(struct vnode *vp, int flags); * * @vp: Vnode of parent directory * @ndp: Namei descriptor of path component + * @type: Vnode type to create with * * Returns zero on success, otherwise a less than zero * value on failure. */ -int vop_create(struct vnode *vp, struct nameidata *ndp); +int vop_create(struct vnode *vp, struct nameidata *ndp, vtype_t type); /* * Get the attributes of a file diff --git a/src/sys/include/sys/proc.h b/src/sys/include/sys/proc.h index a547233..b188d50 100644 --- a/src/sys/include/sys/proc.h +++ b/src/sys/include/sys/proc.h @@ -30,6 +30,7 @@ #ifndef _SYS_PROC_H_ #define _SYS_PROC_H_ +#include <sys/ucred.h> #include <sys/types.h> #include <sys/syscall.h> #include <sys/cdefs.h> @@ -91,6 +92,7 @@ struct proc { struct penv_blk *envblk; struct ptrbox *envblk_box; struct proc *parent; + struct ucred cred; mac_level_t level; struct spinlock maplist_lock; sigtab_t sigtab; diff --git a/src/sys/include/sys/socket.h b/src/sys/include/sys/socket.h new file mode 100644 index 0000000..0ca041f --- /dev/null +++ b/src/sys/include/sys/socket.h @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _SYS_SOCKET_H_ +#define _SYS_SOCKET_H_ 1 + +#include <sys/types.h> +#include <sys/syscall.h> + +/* Address family defines */ +#define AF_UNIX 0x00 /* Local comms / IPC */ +#define AF_LOCAL AF_UNIX /* AF_UNIX alias */ + +/* Socket type defines */ +#define SOCK_STREAM 0x00 +#define SOCK_DGRAM 0x01 + +/* + * Get a socket as a file descriptor + * + * @domain: Socket domain (AF_*) + * @type: Socket type SOCK_* + * + * Returns file descriptor on success, otherwise + * a less than zero value on failure + */ +int socket(int domain, int type, int protocol); + +/* + * @socket: Socket to listen on + * @backlog: Max connections + */ +int listen(int socket, int backlog); + +#if defined(_KERNEL) + +/* + * Kernel representation of a socket + * + * @backlog: Maximum connections (< 0 means socket not active) + */ +struct ksocket { + int backlog; +}; + +/* + * Socket syscall + */ +scret_t sys_socket(struct syscall_args *scargs); + +/* + * Listen syscall + */ +scret_t sys_listen(struct syscall_args *scargs); + +#endif /* _KERNEL */ +#endif /* !_SYS_SOCKET_H_ */ diff --git a/src/sys/include/sys/syscall.h b/src/sys/include/sys/syscall.h index c97d5ea..d148405 100644 --- a/src/sys/include/sys/syscall.h +++ b/src/sys/include/sys/syscall.h @@ -59,6 +59,9 @@ #define SYS_read 0x0E /* read a file descriptor */ #define SYS_close 0x0F /* close a file */ #define SYS_lseek 0x10 /* seek to end of file */ +#define SYS_socket 0x11 /* get a socket fd */ +#define SYS_listen 0x12 /* listen on a socket */ +#define SYS_seteuid 0x13 /* set effective UID */ typedef __ssize_t scret_t; typedef __ssize_t scarg_t; diff --git a/src/sys/include/sys/types.h b/src/sys/include/sys/types.h index b1d5994..745eed7 100644 --- a/src/sys/include/sys/types.h +++ b/src/sys/include/sys/types.h @@ -96,7 +96,6 @@ typedef __size_t uintptr_t; typedef __size_t off_t; typedef int pid_t; typedef int dev_t; -typedef __uint32_t uid_t; typedef __uint32_t mode_t; typedef __uint32_t ino_t; typedef __uint32_t nlink_t; diff --git a/src/sys/include/sys/ucred.h b/src/sys/include/sys/ucred.h new file mode 100644 index 0000000..ab44b6c --- /dev/null +++ b/src/sys/include/sys/ucred.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _SYS_UCRED_H_ +#define _SYS_UCRED_H_ 1 + +#include <sys/types.h> + +/* + * Represents current user credientials + * + * @euid: Effective user ID + * @ruid: Real user ID + * @suid: Saved UID + */ +struct ucred { + uid_t euid; + uid_t ruid; + uid_t suid; +}; + +#endif /* !_SYS_UCRED_H_ */ |