fix modules memory being overwritten

ilobilo · ilobilo · commit 8518623e3b92 · 2025-12-12T23:31:03.000+04:00
add a few more syscalls and stubs
diff --git a/kernel/interfaces/lib/string.cppm b/kernel/interfaces/lib/string.cppm
@@ -144,13 +144,14 @@ export namespace lib
     }
 
     template<typename Type>
-    constexpr Type oct2int(std::string_view str)
+    constexpr Type oct2int(std::span<char> data)
     {
         Type value = 0;
-        auto ptr = str.data();
-        auto len = str.length();
+        auto ptr = data.data();
+        auto len = data.size_bytes();
 
-        while (ptr < str.end() && *ptr && len > 0)
+        const auto end = ptr + len;
+        while (ptr < end && *ptr && len > 0)
         {
             value = value * 8 + (*ptr++ - '0');
             len--;
diff --git a/kernel/interfaces/system/scheduler.cppm b/kernel/interfaces/system/scheduler.cppm
@@ -198,8 +198,8 @@ export namespace sched
     group *group_for(pid_t pgid);
     session *session_for(pid_t sid);
 
-    group *create_group(process *proc);
-    session *create_session(group *grp);
+    group *create_group(pid_t pgid);
+    session *create_session(pid_t sid);
 
     bool change_group(process *proc, group *grp);
     bool change_session(group *grp, session *sess);
diff --git a/kernel/interfaces/system/syscall/misc.cppm b/kernel/interfaces/system/syscall/misc.cppm
@@ -8,5 +8,6 @@ import std;
 export namespace syscall::misc
 {
     int uname(struct utsname __user *buf);
+    int reboot(int magic, int magic2, int op, void __user *arg);
     std::ssize_t getrandom(void __user *buf, std::size_t buflen, unsigned int flags);
 } // export namespace syscall::misc
diff --git a/kernel/interfaces/system/syscall/proc.cppm b/kernel/interfaces/system/syscall/proc.cppm
@@ -23,11 +23,15 @@ export namespace syscall::proc
     pid_t getpgid(pid_t pid);
     int setpgid(pid_t pid, pid_t pgid);
 
+    pid_t setsid();
+
     int getgroups(int size, gid_t __user *list);
     int setgroups(std::size_t size, const gid_t __user *list);
 
     int set_tid_address(int __user *tidptr);
 
+    mode_t umask(mode_t mask);
+
     int sigaction(int signum, const struct sigaction __user *act, struct sigaction __user *oldact);
     int sigprocmask(int how, const struct sigset_t __user *set, struct sigset_t __user *oldset, std::size_t sigsetsize);
     int rseq(struct rseq __user *rseq, std::uint32_t rseq_len, int flags, std::uint32_t sig);
diff --git a/kernel/interfaces/system/syscall/vfs.cppm b/kernel/interfaces/system/syscall/vfs.cppm
@@ -46,4 +46,6 @@ export namespace syscall::vfs
 
     int pipe2(int __user *pipefd, int flags);
     int pipe(int __user *pipefd);
+
+    int socket(int domain, int type, int protocol);
 } // export namespace syscall::vfs
diff --git a/kernel/source/arch/x86_64/system/syscall.cpp b/kernel/source/arch/x86_64/system/syscall.cpp
@@ -50,27 +50,31 @@ namespace x86_64::syscall
         [32] = { "dup", vfs::dup },
         [33] = { "dup2", vfs::dup2 },
         [39] = { "getpid", proc::getpid },
+        [41] = { "socket", vfs::socket },
         [56] = { "clone", proc::clone },
         [57] = { "fork", proc::fork },
         [58] = { "vfork", proc::vfork },
         [63] = { "uname", misc::uname },
         [72] = { "fcntl", vfs::fcntl },
         [79] = { "getcwd", vfs::getcwd, [](std::uintptr_t val) { return val == 0; } },
         [85] = { "creat", vfs::creat },
+        [95] = { "umask", proc::umask },
         [96] = { "gettimeofday", chrono::gettimeofday },
         [102] = { "getuid", proc::getuid },
         [104] = { "getgid", proc::getgid },
         [107] = { "geteuid", proc::geteuid },
         [108] = { "getegid", proc::getegid },
         [109] = { "setpgid", proc::setpgid },
         [110] = { "getppid", proc::getppid },
+        [112] = { "setsid", proc::setsid },
         [115] = { "getgroups", proc::getgroups },
         [116] = { "setgroups", proc::setgroups },
         [118] = { "getresuid", proc::getresuid },
         [120] = { "getresgid", proc::getresgid },
         [121] = { "getpgid", proc::getpgid },
         [158] = { "arch_prctl", arch::arch_prctl },
         [164] = { "settimeofday", chrono::settimeofday },
+        [169] = { "reboot", misc::reboot },
         [186] = { "gettid", proc::gettid },
         [202] = { "futex", proc::futex },
         [218] = { "set_tid_address", proc::set_tid_address },
diff --git a/kernel/source/boot/kernel.cpp b/kernel/source/boot/kernel.cpp
@@ -19,7 +19,7 @@ extern "C"
 
         sched::thread *thread = nullptr;
         {
-            lib::path_view path { "/usr/bin/bash" };
+            lib::path_view path { "/usr/sbin/init" };
             // lib::info("loading {}", path);
 
             auto ret = vfs::resolve(std::nullopt, path);
@@ -38,8 +38,8 @@ extern "C"
             auto pmap = std::make_shared<vmm::pagemap>();
             auto proc = sched::process::create(nullptr, pmap);
 
-            proc->ruid = proc->euid = proc->suid = 1000;
-            proc->rgid = proc->egid = proc->sgid = 1000;
+            // proc->ruid = proc->euid = proc->suid = 1000;
+            // proc->rgid = proc->egid = proc->sgid = 1000;
 
             lib::path_view tty_path { "/dev/tty0" };
             ret = vfs::resolve(std::nullopt, tty_path);
@@ -61,10 +61,10 @@ extern "C"
                 .interp = { },
                 .argv = { path.basename().data() },
                 .envp = {
-                    "TERM=linux",
-                    "USER=ilobilix",
-                    "HOME=/home/ilobilix",
-                    "PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin"
+                    // "TERM=linux",
+                    // "USER=ilobilix",
+                    // "HOME=/home/ilobilix",
+                    // "PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin"
                 }
             }, proc);
 
diff --git a/kernel/source/deps/uacpi.cpp b/kernel/source/deps/uacpi.cpp
@@ -240,8 +240,8 @@ extern "C"
     {
         auto &pmap = vmm::kernel_pagemap;
 
-        // const auto psize = vmm::pagemap::max_page_size(len);
-        const auto psize = vmm::page_size::small;
+        const auto psize = vmm::pagemap::max_page_size(addr, len);
+        // const auto psize = vmm::page_size::small;
         const auto npsize = vmm::pagemap::from_page_size(psize);
 
         const auto paddr = lib::align_down(addr, npsize);
diff --git a/kernel/source/drivers/fs/dev/tty.cpp b/kernel/source/drivers/fs/dev/tty.cpp
@@ -142,13 +142,14 @@ namespace fs::dev::tty
 
         std::shared_ptr<instance> create_instance(std::uint32_t minor) override
         {
-            lib::debug("tty: creating test instance with minor {}", minor);
+            // lib::debug("tty: creating test instance with minor {}", minor);
             return std::make_shared<test_instance>(this, minor);
         }
 
         void destroy_instance(std::shared_ptr<instance> inst) override
         {
-            lib::debug("tty: destroying test instance with minor {}", inst->minor);
+            lib::unused(inst);
+            // lib::debug("tty: destroying test instance with minor {}", inst->minor);
         }
 
         int ioctl(std::shared_ptr<instance> inst, unsigned long request, lib::uptr_or_addr argp) override
@@ -206,7 +207,7 @@ namespace fs::dev::tty
             }
             self->private_data = inst;
 
-            lib::debug("tty: opened ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);
+            // lib::debug("tty: opened ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);
             return true;
         }
 
@@ -239,8 +240,8 @@ namespace fs::dev::tty
             }
             self->private_data.reset();
 
-            const auto rdev = self->path.dentry->inode->stat.st_rdev;
-            lib::debug("tty: closed ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);
+            // const auto rdev = self->path.dentry->inode->stat.st_rdev;
+            // lib::debug("tty: closed ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);
             return true;
         }
 
diff --git a/kernel/source/drivers/initramfs.cpp b/kernel/source/drivers/initramfs.cpp
@@ -66,7 +66,7 @@ namespace initramfs
 
             auto current = reinterpret_cast<header *>(data.data());
             while (magic == std::string_view { current->magic, 6 } &&
-                current < reinterpret_cast<header *>(data.data() + data.size()))
+                current <= reinterpret_cast<header *>(data.data() + data.size() - sizeof(header)))
             {
                 if (current->name[0] == '\0')
                     break;
@@ -87,12 +87,12 @@ namespace initramfs
 
                 const auto linkname { get_string(current->linkname) };
 
-                const auto mode = lib::oct2int<mode_t>(get_string(current->mode));
-                const auto size = lib::oct2int<std::size_t>(get_string(current->size));
-                const auto mtim = lib::oct2int<time_t>(get_string(current->mtime));
+                const auto mode = lib::oct2int<mode_t>(current->mode);
+                const auto size = lib::oct2int<std::size_t>(current->size);
+                const auto mtim = lib::oct2int<time_t>(current->mtime);
 
-                const auto devmajor = lib::oct2int<time_t>(get_string(current->devmajor));
-                const auto devminor = lib::oct2int<time_t>(get_string(current->devminor));
+                const auto devmajor = lib::oct2int<time_t>(current->devmajor);
+                const auto devminor = lib::oct2int<time_t>(current->devminor);
                 const dev_t dev = vfs::dev::makedev(devmajor, devminor);
 
                 std::shared_ptr<vfs::inode> inode;
@@ -223,7 +223,10 @@ namespace initramfs
                     inode->stat.st_mtim = timespec { mtim, 0 };
 
                 next:
-                current = reinterpret_cast<header *>(reinterpret_cast<std::uintptr_t>(current) + 512 + lib::align_up(size, 512zu));
+                current = reinterpret_cast<header *>(
+                    reinterpret_cast<std::uintptr_t>(current) +
+                    512 + lib::align_up(size, 512zu)
+                );
             }
             return true;
         }
@@ -254,7 +257,7 @@ namespace initramfs
                 lib::panic("could not find initramfs");
 
             std::span<std::byte> data {
-                reinterpret_cast<std::byte *>(lib::tohh(module->address)),
+                reinterpret_cast<std::byte *>(module->address),
                 module->size
             };
 
diff --git a/kernel/source/system/bin/elf/exec.cpp b/kernel/source/system/bin/elf/exec.cpp
@@ -20,7 +20,7 @@ namespace bin::elf::exec
     {
         private:
         static inline constexpr std::uintptr_t default_base = 0x400000;
-        static inline constexpr std::uintptr_t defautl_interp_base = 0x40000000;
+        static inline constexpr std::uintptr_t default_interp_base = 0x40000000;
 
         struct auxval
         {
@@ -189,7 +189,7 @@ namespace bin::elf::exec
             std::uintptr_t entry = auxv.at_entry;
             if (interp)
             {
-                interp_base = defautl_interp_base;
+                interp_base = default_interp_base;
                 ret = load_file(interp, proc->vmspace, interp_base);
                 if (!ret.has_value())
                     return nullptr;
diff --git a/kernel/source/system/memory/pagemap.cpp b/kernel/source/system/memory/pagemap.cpp
@@ -320,7 +320,7 @@ namespace vmm
                 if (memmap->length == 0)
                     continue;
 
-                const auto psize = pagemap::max_page_size(memmap->length);
+                const auto psize = pagemap::max_page_size(memmap->base, memmap->length);
                 const auto npsize = pagemap::from_page_size(psize);
 
                 const auto base = lib::align_down(memmap->base, npsize);
diff --git a/kernel/source/system/memory/pmm.cpp b/kernel/source/system/memory/pmm.cpp
@@ -532,11 +532,15 @@ namespace pmm
         for (std::size_t i = 0; i < num; i++)
         {
             const auto memmap = memmaps[i];
+            const auto type = static_cast<boot::memmap>(memmap->type);
+
             const std::uintptr_t end = memmap->base + memmap->length;
             mem.top = std::max(mem.top, end);
 
-            if (static_cast<boot::memmap>(memmap->type) == boot::memmap::usable)
-                mem.usable_top = std::max(mem.usable_top, end);
+            if (type != boot::memmap::usable && type != boot::memmap::bootloader && type != boot::memmap::kernel_and_modules)
+                continue;
+
+            mem.usable_top = std::max(mem.usable_top, end);
         }
 
         std::size_t pfndb_used_total = 0;
@@ -559,7 +563,7 @@ namespace pmm
                 const auto memmap = memmaps[i];
                 const auto type = static_cast<boot::memmap>(memmap->type);
 
-                if (type != boot::memmap::usable && type != boot::memmap::bootloader)
+                if (type != boot::memmap::usable && type != boot::memmap::bootloader && type != boot::memmap::kernel_and_modules)
                     continue;
 
                 pfndb_add(i);
@@ -575,11 +579,11 @@ namespace pmm
                 continue;
 
             const auto memmap = memmaps[i];
-
             const auto type = static_cast<boot::memmap>(memmap->type);
+
             if (type != boot::memmap::usable)
             {
-                if (type == boot::memmap::kernel_and_modules || type == boot::memmap::bootloader)
+                if (type == boot::memmap::bootloader || type == boot::memmap::kernel_and_modules)
                 {
                     mem.used += memmap->length;
                     mem.usable += memmap->length;
diff --git a/kernel/source/system/pci/acpi.cpp b/kernel/source/system/pci/acpi.cpp
@@ -51,7 +51,7 @@ namespace pci::acpi
             const auto vaddr = lib::fromhh(vmm::alloc_vspace(size));
 
             const auto flags = vmm::pflag::rw;
-            const auto psize = vmm::pagemap::max_page_size(size);
+            const auto psize = vmm::page_size::small;
             const auto caching = vmm::caching::mmio;
 
             if (const auto ret = vmm::kernel_pagemap->map(vaddr, paddr, size, flags, psize, caching); !ret)
diff --git a/kernel/source/system/scheduler.cpp b/kernel/source/system/scheduler.cpp
@@ -129,22 +129,22 @@ namespace sched
 
     bool is_initialised() { return initialised; }
 
-    group *create_group(process *proc)
+    group *create_group(pid_t pgid)
     {
-        auto grp = new group { };
-        grp->pgid = proc->pgid = proc->pid;
-        grp->members.write_lock().value()[proc->pid] = proc;
-        groups.write_lock().value()[grp->pgid] = grp;
-        return grp;
+        return groups.write_lock().value()[pgid] = new group {
+            .pgid = pgid,
+            .sid = 0,
+            .members = { }
+        };
     }
 
-    session *create_session(group *grp)
+    session *create_session(pid_t sid)
     {
-        auto sess = new session { };
-        sess->sid = grp->pgid;
-        sess->members.write_lock().value()[grp->pgid] = grp;
-        sessions.write_lock().value()[sess->sid] = sess;
-        return sess;
+        return sessions.write_lock().value()[sid] = new session {
+            .sid = sid,
+            .members = { },
+            .controlling_tty = nullptr
+        };
     }
 
     bool change_group(process *proc, group *grp)
@@ -338,9 +338,15 @@ namespace sched
             if (proc->pid == 1)
             {
                 lib::bug_on(parent != nullptr);
-                // proc->pgid is set in create_group
-                auto grp = create_group(proc);
-                grp->sid = proc->sid = create_session(grp)->sid;
+                auto grp = new group { };
+                grp->pgid = proc->pgid = proc->pid;
+                grp->members.write_lock().value()[proc->pid] = proc;
+                groups.write_lock().value()[grp->pgid] = grp;
+
+                auto sess = new session { };
+                proc->sid = grp->sid = sess->sid = grp->pgid;
+                sess->members.write_lock().value()[grp->pgid] = grp;
+                sessions.write_lock().value()[sess->sid] = sess;
             }
             else if (parent)
             {
diff --git a/kernel/source/system/syscall/misc.cpp b/kernel/source/system/syscall/misc.cpp
diff --git a/kernel/source/system/syscall/proc.cpp b/kernel/source/system/syscall/proc.cpp
diff --git a/kernel/source/system/syscall/vfs.cpp b/kernel/source/system/syscall/vfs.cpp

Original file line number	Diff line number	Diff line change
`@@ -144,13 +144,14 @@ export namespace lib`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`template<typename Type>`
`147`		`- constexpr Type oct2int(std::string_view str)`
	`147`	`+ constexpr Type oct2int(std::span<char> data)`
`148`	`148`	`{`
`149`	`149`	`Type value = 0;`
`150`		`- auto ptr = str.data();`
`151`		`- auto len = str.length();`
	`150`	`+ auto ptr = data.data();`
	`151`	`+ auto len = data.size_bytes();`
`152`	`152`
`153`		`- while (ptr < str.end() && *ptr && len > 0)`
	`153`	`+ const auto end = ptr + len;`
	`154`	`+ while (ptr < end && *ptr && len > 0)`
`154`	`155`	`{`
`155`	`156`	`value = value * 8 + (*ptr++ - '0');`
`156`	`157`	`len--;`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ import std;`
`8`	`8`	`export namespace syscall::misc`
`9`	`9`	`{`
`10`	`10`	`int uname(struct utsname __user *buf);`
	`11`	`+ int reboot(int magic, int magic2, int op, void __user *arg);`
`11`	`12`	`std::ssize_t getrandom(void __user *buf, std::size_t buflen, unsigned int flags);`
`12`	`13`	`} // export namespace syscall::misc`
Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ extern "C"`
`240`	`240`	`{`
`241`	`241`	`auto &pmap = vmm::kernel_pagemap;`
`242`	`242`
`243`		`- // const auto psize = vmm::pagemap::max_page_size(len);`
`244`		`- const auto psize = vmm::page_size::small;`
	`243`	`+ const auto psize = vmm::pagemap::max_page_size(addr, len);`
	`244`	`+ // const auto psize = vmm::page_size::small;`
`245`	`245`	`const auto npsize = vmm::pagemap::from_page_size(psize);`
`246`	`246`
`247`	`247`	`const auto paddr = lib::align_down(addr, npsize);`
Original file line number	Diff line number	Diff line change
`@@ -142,13 +142,14 @@ namespace fs::dev::tty`
`142`	`142`
`143`	`143`	`std::shared_ptr<instance> create_instance(std::uint32_t minor) override`
`144`	`144`	`{`
`145`		`- lib::debug("tty: creating test instance with minor {}", minor);`
	`145`	`+ // lib::debug("tty: creating test instance with minor {}", minor);`
`146`	`146`	`return std::make_shared<test_instance>(this, minor);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void destroy_instance(std::shared_ptr<instance> inst) override`
`150`	`150`	`{`
`151`		`- lib::debug("tty: destroying test instance with minor {}", inst->minor);`
	`151`	`+ lib::unused(inst);`
	`152`	`+ // lib::debug("tty: destroying test instance with minor {}", inst->minor);`
`152`	`153`	`}`
`153`	`154`
`154`	`155`	`int ioctl(std::shared_ptr<instance> inst, unsigned long request, lib::uptr_or_addr argp) override`
`@@ -206,7 +207,7 @@ namespace fs::dev::tty`
`206`	`207`	`}`
`207`	`208`	`self->private_data = inst;`
`208`	`209`
`209`		`- lib::debug("tty: opened ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);`
	`210`	`+ // lib::debug("tty: opened ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);`
`210`	`211`	`return true;`
`211`	`212`	`}`
`212`	`213`
`@@ -239,8 +240,8 @@ namespace fs::dev::tty`
`239`	`240`	`}`
`240`	`241`	`self->private_data.reset();`
`241`	`242`
`242`		`- const auto rdev = self->path.dentry->inode->stat.st_rdev;`
`243`		`- lib::debug("tty: closed ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);`
	`243`	`+ // const auto rdev = self->path.dentry->inode->stat.st_rdev;`
	`244`	`+ // lib::debug("tty: closed ({}, {}) for pid {}", major(rdev), minor(rdev), self->pid);`
`244`	`245`	`return true;`
`245`	`246`	`}`
`246`	`247`