Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reboot [and fix user/group permissions in fork()]

Browse Source
This commit is contained in:
Kevin Lange 2012-01-26 23:11:43 -06:00
parent 8edb567279
commit d112f6fedb
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/sys/process.c
View File

@ -220,6 +220,10 @@ process_t * spawn_process(volatile process_t * parent) {
proc->name = default_name; /* Use the default name */ proc->name = default_name; /* Use the default name */
proc->description = NULL; /* No description */ proc->description = NULL; /* No description */
/* Copy permissions */
proc->user = parent->user;
proc->group = parent->group;
/* Zero out the ESP/EBP/EIP */ /* Zero out the ESP/EBP/EIP */
proc->thread.esp = 0; proc->thread.esp = 0;
proc->thread.ebp = 0; proc->thread.ebp = 0;

20
kernel/sys/syscall.c
View File

@ -238,7 +238,7 @@ static int getuid() {
} }
static int setuid(user_t new_uid) { static int setuid(user_t new_uid) {
if (current_process->user != USER_ROOT_UID) { if (current_process->user == USER_ROOT_UID) {
current_process->user = new_uid; current_process->user = new_uid;
return 0; return 0;
} }
@ -261,6 +261,23 @@ static int kernel_name_XXX(char * buffer) {
__kernel_arch); __kernel_arch);
} }
static int reboot() {
kprintf("[kernel] Reboot requested from process %d by user #%d\n", current_process->id, current_process->user);
kprintf("[kernel] Good bye!\n");
if (current_process->user != 0) {
return -1;
} else {
/* Goodbye, cruel world */
uint8_t out = 0x02;
while ((out & 0x02) != 0) {
out = inportb(0x64);
}
outportb(0x64, 0xFE); /* Reset */
STOP;
}
return 0;
}
/* /*
* System Call Internals * System Call Internals
*/ */
@ -293,6 +310,7 @@ static uintptr_t syscalls[] = {
(uintptr_t)&getuid, (uintptr_t)&getuid,
(uintptr_t)&setuid, /* 24 */ (uintptr_t)&setuid, /* 24 */
(uintptr_t)&kernel_name_XXX, (uintptr_t)&kernel_name_XXX,
(uintptr_t)&reboot,
0 0
}; };
uint32_t num_syscalls; uint32_t num_syscalls;

13
userspace/reboot.c Normal file
View File

@ -0,0 +1,13 @@
#include <stdio.h>
#include <syscall.h>
DEFN_SYSCALL0(getuid, 23);
DEFN_SYSCALL0(reboot, 26);
int main(int argc, char ** argv) {
printf("uid is %d\n", syscall_getuid());
if (syscall_reboot() < 0) {
printf("%s: need to be root.\n", argv[0]);
}
return 1;
}