RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-14 23:07:36 +00:00
Code Issues Activity Actions

Kernel: Ptrace::handle_syscall() should return errors as KResult

Browse source
This commit is contained in:
Andreas Kling 2020-12-23 14:55:24 +01:00
parent eaa63fdda5
commit 23febb9d8e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Ptrace.cpp
View file

@ -128,27 +128,27 @@ KResultOr<u32> handle_syscall(const Kernel::Syscall::SC_ptrace_params& params, P
case PT_PEEK: { case PT_PEEK: {
Kernel::Syscall::SC_ptrace_peek_params peek_params; Kernel::Syscall::SC_ptrace_peek_params peek_params;
if (!copy_from_user(&peek_params, reinterpret_cast<Kernel::Syscall::SC_ptrace_peek_params*>(params.addr))) if (!copy_from_user(&peek_params, reinterpret_cast<Kernel::Syscall::SC_ptrace_peek_params*>(params.addr)))
return -EFAULT; return KResult(-EFAULT);
if (!is_user_address(VirtualAddress { peek_params.address })) if (!is_user_address(VirtualAddress { peek_params.address }))
return -EFAULT; return KResult(-EFAULT);
auto result = peer->process().peek_user_data(Userspace<const u32*> { (FlatPtr)peek_params.address }); auto result = peer->process().peek_user_data(Userspace<const u32*> { (FlatPtr)peek_params.address });
if (result.is_error()) if (result.is_error())
return result.error(); return result.error();
if (!copy_to_user(peek_params.out_data, &result.value())) if (!copy_to_user(peek_params.out_data, &result.value()))
return -EFAULT; return KResult(-EFAULT);
break; break;
} }
case PT_POKE: case PT_POKE:
if (!is_user_address(VirtualAddress { params.addr })) if (!is_user_address(VirtualAddress { params.addr }))
return -EFAULT; return KResult(-EFAULT);
return peer->process().poke_user_data(Userspace<u32*> { (FlatPtr)params.addr }, params.data); return peer->process().poke_user_data(Userspace<u32*> { (FlatPtr)params.addr }, params.data);
default: default:
return -EINVAL; return KResult(-EINVAL);
} }
return 0; return KSuccess;
} }
void copy_kernel_registers_into_ptrace_registers(PtraceRegisters& ptrace_regs, const RegisterState& kernel_regs) void copy_kernel_registers_into_ptrace_registers(PtraceRegisters& ptrace_regs, const RegisterState& kernel_regs)