sysctl: console_lock sysctl

kernel-src/include/kernel/sysctl.h

@@ -9,6 +9,7 @@
 #define SYS_CTL_KERN 1
 #define SYS_CTL_KERN_PROC 1
 #define SYS_CTL_KERN_PROC_ALL 1
+#define SYS_CTL_KERN_CONSOLE_LOCK 2
 
 #define SYS_CTL_KERN_PROC_INFO_NAME_SIZE 64
 #define SYS_CTL_KERN_PROC_INFO_TTY_NAME_SIZE 64

kernel-src/sys/ctl/kern.c

@@ -1,15 +1,12 @@
 #include <kernel/sysctl.h>
 #include <kernel/proc.h>
+#include <kernel/console.h>
 #include <kernel/usercopy.h>
 #include <kernel/alloc.h>
 #include <kernel/jobctl.h>
 #include <kernel/tty.h>
-
+#include <arch/cpu.h>
-#define SYS_CTL_NAME_MAX 6
+#include <logging.h>
-
-#define SYS_CTL_KERN 1
-#define SYS_CTL_KERN_PROC 1
-#define SYS_CTL_KERN_PROC_ALL 1
 
 static void release_procs(proc_t **procs, size_t size) {
 	for (size_t i = 0; i < size; ++i) {
@@ -17,7 +14,6 @@ static void release_procs(proc_t **procs, size_t size) {
 	}
 }
 
-// TODO: fix size differences returning ENOMEM
 static int ctl_proc(const int *name, size_t name_len, void *oldp, size_t *old_lenp, void *newp, size_t) {
 	if (name_len != 4)
 		return EINVAL;
@@ -102,10 +98,70 @@ static int ctl_proc(const int *name, size_t name_len, void *oldp, size_t *old_le
 	return error;
 }
 
+static int check_console_lock_permission(proc_t *proc) {
+	if (CRED_IS_ESU(&proc->cred))
+		return 0;
+
+	tty_t *ctty = jobctl_getctty(proc);
+	if (!ctty)
+		return EPERM;
+
+	bool is_console = console_is_tty(ctty);
+	tty_release(ctty);
+	if (!is_console)
+		return EPERM;
+
+	proc_t *session = jobctl_getsession(proc);
+	bool allowed = session->cred.uid == proc->cred.euid;
+	PROC_RELEASE(session);
+
+	return allowed ? 0 : EPERM;
+}
+
+static int ctl_console_lock(const int *, size_t name_len, void *oldp, size_t *old_lenp, void *newp, size_t new_len) {
+	if (name_len != 0)
+		return EINVAL;
+
+	if (oldp || old_lenp)
+		return EINVAL;
+
+	if (!newp || new_len != sizeof(int))
+		return EINVAL;
+
+	int value;
+	int error = USERCOPY_POSSIBLY_FROM_USER(&value, newp, sizeof(value));
+	if (error)
+		return error;
+
+	proc_t *proc = current_thread()->proc;
+	bool lock = value != 0;
+	if (lock) {
+		error = check_console_lock_permission(proc);
+		if (error)
+			return error;
+
+		error = console_set_lock(true);
+		if (error)
+			return error;
+
+		__atomic_store_n(&proc->console_locked, true, __ATOMIC_SEQ_CST);
+	} else {
+		bool expected = true;
+		if (!__atomic_compare_exchange_n(&proc->console_locked, &expected, false, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST))
+			return EPERM;
+
+		__assert(console_set_lock(false) == 0);
+	}
+
+	return 0;
+}
+
 int sysctl_kern(const int *name, size_t name_len, void *oldp, size_t *old_lenp, void *newp, size_t new_len) {
 	switch (*name) {
 		case SYS_CTL_KERN_PROC:
 			return ctl_proc(name + 1, name_len - 1, oldp, old_lenp, newp, new_len);
+		case SYS_CTL_KERN_CONSOLE_LOCK:
+			return ctl_console_lock(name + 1, name_len - 1, oldp, old_lenp, newp, new_len);
 	}
 
 	return EINVAL;

patches/mlibc/jinx-working-patch.patch

@@ -888,10 +888,10 @@ index a6c4067..9040d45 100644
  
 diff --git mlibc-workdir/sysdeps/astral/include/astral/sysctl.h mlibc-workdir/sysdeps/astral/include/astral/sysctl.h
 new file mode 100644
-index 0000000..161f634
+index 0000000..3379839
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/include/astral/sysctl.h
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,57 @@
 +#ifndef _ASTRAL_SYSCTL_H
 +#define _ASTRAL_SYSCTL_H
 +
@@ -906,6 +906,7 @@ index 0000000..161f634
 +#define SYS_CTL_KERN 1
 +#define SYS_CTL_KERN_PROC 1
 +#define SYS_CTL_KERN_PROC_ALL 1
++#define SYS_CTL_KERN_CONSOLE_LOCK 2
 +
 +#define SYS_CTL_KERN_PROC_INFO_NAME_SIZE 64
 +#define SYS_CTL_KERN_PROC_INFO_TTY_NAME_SIZE 64

recipes/mlibc-headers

@@ -1,6 +1,6 @@
 name=mlibc-headers
 from_source=mlibc
-revision=4
+revision=5
 imagedeps="ninja-build meson build-essential rsync"
 builddeps="linux-headers"