DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-13 02:46:46 +00:00
Code Issues Releases Wiki Activity

bugfix: 修复sys_wait4中，当status指针为NULL时的错误。

Browse Source
This commit is contained in:
fslongjin 2022-07-31 17:06:37 +08:00
parent a02acbdbe6
commit b98a3679c9
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/syscall/syscall.c
View File

@ -16,8 +16,7 @@
extern void system_call(void); extern void system_call(void);
extern void syscall_int(void); extern void syscall_int(void);
extern uint64_t sys_clock(struct pt_regs* regs); extern uint64_t sys_clock(struct pt_regs *regs);
/** /**
* @brief 导出系统调用处理函数的符号 * @brief 导出系统调用处理函数的符号
@ -470,8 +469,6 @@ uint64_t sys_brk(struct pt_regs *regs)
else else
offset = -(int64_t)(current_pcb->mm->brk_end - new_brk); offset = -(int64_t)(current_pcb->mm->brk_end - new_brk);
new_brk = mm_do_brk(current_pcb->mm->brk_end, offset); // 扩展堆内存空间 new_brk = mm_do_brk(current_pcb->mm->brk_end, offset); // 扩展堆内存空间
current_pcb->mm->brk_end = new_brk; current_pcb->mm->brk_end = new_brk;
@ -705,6 +702,7 @@ uint64_t sys_wait4(struct pt_regs *regs)
wait_queue_sleep_on_interriptible(&current_pcb->wait_child_proc_exit); wait_queue_sleep_on_interriptible(&current_pcb->wait_child_proc_exit);
// 拷贝子进程的返回码 // 拷贝子进程的返回码
if (likely(status != NULL))
*status = child_proc->exit_code; *status = child_proc->exit_code;
// copy_to_user(status, (void*)child_proc->exit_code, sizeof(int)); // copy_to_user(status, (void*)child_proc->exit_code, sizeof(int));
proc->next_pcb = child_proc->next_pcb; proc->next_pcb = child_proc->next_pcb;
@ -727,11 +725,10 @@ uint64_t sys_exit(struct pt_regs *regs)
return process_do_exit(regs->r8); return process_do_exit(regs->r8);
} }
uint64_t sys_nanosleep(struct pt_regs *regs)
uint64_t sys_nanosleep(struct pt_regs * regs)
{ {
const struct timespec * rqtp = (const struct timespec*)regs->r8; const struct timespec *rqtp = (const struct timespec *)regs->r8;
struct timespec * rmtp = (struct timespec*)regs->r9; struct timespec *rmtp = (struct timespec *)regs->r9;
return nanosleep(rqtp, rmtp); return nanosleep(rqtp, rmtp);
} }