summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/sys/arch/amd64/cpu/trap.c24
-rw-r--r--src/sys/include/compat/unix/syscall.h4
-rw-r--r--src/sys/include/os/ucred.h61
-rw-r--r--src/sys/include/sys/proc.h2
-rw-r--r--src/sys/include/sys/syscall.h1
-rw-r--r--src/sys/include/sys/types.h1
-rw-r--r--src/sys/include/sys/ucred.h48
-rw-r--r--src/sys/io/ic/ahci.c28
-rw-r--r--src/sys/os/os_iotap.c3
-rw-r--r--src/sys/os/os_proc.c8
-rw-r--r--src/sys/os/os_ucred.c90
11 files changed, 252 insertions, 18 deletions
diff --git a/src/sys/arch/amd64/cpu/trap.c b/src/sys/arch/amd64/cpu/trap.c
index ae3a0cc..94c6e83 100644
--- a/src/sys/arch/amd64/cpu/trap.c
+++ b/src/sys/arch/amd64/cpu/trap.c
@@ -34,6 +34,7 @@
#include <sys/param.h>
#include <sys/cdefs.h>
+#include <sys/errno.h>
#include <sys/panic.h>
#include <sys/cpuvar.h>
#include <sys/syslog.h>
@@ -148,6 +149,26 @@ trapframe_dump(struct trapframe *tf)
tf->rbp, tf->rsp, tf->rip);
}
+/*
+ * Handle user faults
+ */
+static void
+handle_ufault(void)
+{
+ struct proc *self = proc_self();
+
+ if (__unlikely(self == NULL)) {
+ panic("could not get self on fault\n");
+ }
+
+ syslog_toggle(true);
+ printf("** hardware violation **\n");
+ syslog_toggle(false);
+
+ proc_kill(self, -EFAULT);
+ __builtin_unreachable();
+}
+
void
trap_syscall(struct trapframe *tf)
{
@@ -194,7 +215,8 @@ trap_handler(struct trapframe *tf)
{
trapframe_dump(tf);
if (ISSET(tf->cs, 3)) {
- panic("fatal user trap\n");
+ handle_ufault();
+ __builtin_unreachable();
}
panic("fatal trap\n");
diff --git a/src/sys/include/compat/unix/syscall.h b/src/sys/include/compat/unix/syscall.h
index 38419af..9b76139 100644
--- a/src/sys/include/compat/unix/syscall.h
+++ b/src/sys/include/compat/unix/syscall.h
@@ -35,6 +35,7 @@
#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>
@@ -98,7 +99,8 @@ scret_t(*g_unix_sctab[])(struct syscall_args *) = {
[SYS_close] = sys_close,
[SYS_lseek] = sys_lseek,
[SYS_socket] = sys_socket,
- [SYS_listen] = sys_listen
+ [SYS_listen] = sys_listen,
+ [SYS_seteuid] = sys_seteuid
};
#endif /* !_NEED_UNIX_SCTAB */
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/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/syscall.h b/src/sys/include/sys/syscall.h
index 2ca712f..d148405 100644
--- a/src/sys/include/sys/syscall.h
+++ b/src/sys/include/sys/syscall.h
@@ -61,6 +61,7 @@
#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_ */
diff --git a/src/sys/io/ic/ahci.c b/src/sys/io/ic/ahci.c
index 383e531..f4b38d2 100644
--- a/src/sys/io/ic/ahci.c
+++ b/src/sys/io/ic/ahci.c
@@ -665,6 +665,7 @@ ahci_init_port(struct ahci_hba *hba, struct ahci_port *port)
const uint16_t BSIZE = 512;
volatile struct hba_port *regs;
struct ahci_cmd_hdr *cmdlist;
+ struct ahci_port *port_cpy;
uint32_t cmd, lo, hi;
size_t clen;
paddr_t pa;
@@ -718,8 +719,14 @@ ahci_init_port(struct ahci_hba *hba, struct ahci_port *port)
return error;
}
- TAILQ_INSERT_TAIL(&portlist, port, link);
- ahci_identify(hba, port);
+ port_cpy = kalloc(sizeof(*port_cpy));
+ if (port_cpy == NULL) {
+ return -ENOMEM;
+ }
+
+ memcpy(port_cpy, port, sizeof(*port_cpy));
+ TAILQ_INSERT_TAIL(&portlist, port_cpy, link);
+ ahci_identify(hba, port_cpy);
return 0;
}
@@ -730,7 +737,7 @@ static int
ahci_init_ports(struct ahci_hba *hba)
{
volatile struct hba_memspace *io = hba->io;
- struct ahci_port *port;
+ struct ahci_port port;
uint32_t pi, nbits;
int error;
@@ -743,20 +750,13 @@ ahci_init_ports(struct ahci_hba *hba)
/* Allocate a new port descriptor */
dtrace("port %d implemented\n", i);
- port = kalloc(sizeof(*port));
- if (port == NULL) {
- dtrace("failed to allocate port\n");
- continue;
- }
-
- port->io = &io->ports[i];
- port->portno = i;
- port->parent = hba;
+ port.io = &io->ports[i];
+ port.portno = i;
+ port.parent = hba;
/* Initialize the port */
- error = ahci_init_port(hba, port);
+ error = ahci_init_port(hba, &port);
if (error < 0) {
- ahci_port_detach(port);
dtrace("port init failed (error=%d)\n", error);
continue;
}
diff --git a/src/sys/os/os_iotap.c b/src/sys/os/os_iotap.c
index 238acfe..54d1157 100644
--- a/src/sys/os/os_iotap.c
+++ b/src/sys/os/os_iotap.c
@@ -130,6 +130,9 @@ iotap_mux(const char *name, struct iotap_msg *msg)
ops = desc.ops;
switch (msg->opcode) {
case IOTAP_OPC_READ:
+ if (ops->read == NULL) {
+ return -ENOTSUP;
+ }
return ops->read(&desc, msg->buf, msg->len);
}
diff --git a/src/sys/os/os_proc.c b/src/sys/os/os_proc.c
index a8f49d7..ef6c04c 100644
--- a/src/sys/os/os_proc.c
+++ b/src/sys/os/os_proc.c
@@ -40,6 +40,7 @@
#include <os/systm.h>
#include <vm/vm.h>
#include <vm/physseg.h>
+#include <os/ucred.h>
#include <os/elfload.h>
#include <os/signal.h>
#include <os/kalloc.h>
@@ -386,9 +387,14 @@ proc_spawn(const char *path, struct penv_blk *envbp)
proc->envblk = envbp;
proc->parent = proc_self();
+ error = ucred_init(proc->parent, &proc->cred);
+ if (error < 0) {
+ kfree(proc);
+ return error;
+ }
+
md_set_ip(proc, elf.entrypoint);
sched_enq(&core->scq, proc);
-
TAILQ_INSERT_TAIL(&procq, proc, lup_link);
return proc->pid;
}
diff --git a/src/sys/os/os_ucred.c b/src/sys/os/os_ucred.c
new file mode 100644
index 0000000..bf46308
--- /dev/null
+++ b/src/sys/os/os_ucred.c
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <sys/errno.h>
+#include <os/ucred.h>
+#include <os/ucred.h>
+
+int
+ucred_init(struct proc *proc, struct ucred *cred)
+{
+ struct ucred *curcred;
+
+ if (cred == NULL) {
+ return -EINVAL;
+ }
+
+ if (proc != NULL) {
+ curcred = &proc->cred;
+ cred->ruid = curcred->ruid;
+ } else {
+ cred->ruid = 0;
+ }
+
+ cred->euid = cred->ruid;
+ cred->suid = cred->ruid;
+ return 0;
+}
+
+int
+seteuid(uid_t euid)
+{
+ struct proc *self = proc_self();
+ struct ucred *cred;
+ int retval = -EPERM;
+
+ if (__unlikely(self == NULL)) {
+ return -ESRCH;
+ }
+
+ /* Verify against current creds */
+ cred = &self->cred;
+ if (euid == cred->euid || euid == cred->ruid) {
+ cred->euid = euid;
+ retval = 0;
+ } else if (euid == cred->suid || cred->euid == 0) {
+ cred->euid = euid;
+ retval = 0;
+ }
+
+ return retval;
+}
+
+/*
+ * ARG0: EUID
+ */
+scret_t
+sys_seteuid(struct syscall_args *scargs)
+{
+ uid_t euid = SCARG(scargs, int, 0);
+
+ return seteuid(euid);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-19 18:52:31 +0000