RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:32:44 +00:00
Code Issues Activity Actions

Kernel: Use TRY() in sys$ptrace()

Browse source
This commit is contained in:
Andreas Kling 2021-09-05 16:11:42 +02:00
parent b2950c67ea
commit aa4d5817af
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Syscalls/ptrace.cpp
View file

@ -52,9 +52,7 @@ static KResultOr<u32> handle_ptrace(const Kernel::Syscall::SC_ptrace_params& par
if (peer_process.tracer()) { if (peer_process.tracer()) {
return EBUSY; return EBUSY;
} }
auto result = peer_process.start_tracing_from(caller.pid()); TRY(peer_process.start_tracing_from(caller.pid()));
if (result.is_error())
return result.error();
SpinlockLocker lock(peer->get_lock()); SpinlockLocker lock(peer->get_lock());
if (peer->state() != Thread::State::Stopped) { if (peer->state() != Thread::State::Stopped) {
peer->send_signal(SIGSTOP, &caller); peer->send_signal(SIGSTOP, &caller);
@ -123,10 +121,8 @@ static KResultOr<u32> handle_ptrace(const Kernel::Syscall::SC_ptrace_params& par
return EFAULT; return EFAULT;
if (!Memory::is_user_address(VirtualAddress { peek_params.address })) if (!Memory::is_user_address(VirtualAddress { peek_params.address }))
return EFAULT; return EFAULT;
auto result = peer->process().peek_user_data(Userspace<const u32*> { (FlatPtr)peek_params.address }); auto data = TRY(peer->process().peek_user_data(Userspace<const u32*> { (FlatPtr)peek_params.address }));
if (result.is_error()) if (!copy_to_user(peek_params.out_data, &data))
return result.error();
if (!copy_to_user(peek_params.out_data, &result.value()))
return EFAULT; return EFAULT;
break; break;
} }
@ -140,10 +136,8 @@ static KResultOr<u32> handle_ptrace(const Kernel::Syscall::SC_ptrace_params& par
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 EFAULT;
auto result = peer->peek_debug_register(reinterpret_cast<uintptr_t>(peek_params.address)); auto data = TRY(peer->peek_debug_register(reinterpret_cast<uintptr_t>(peek_params.address)));
if (result.is_error()) if (!copy_to_user(peek_params.out_data, &data))
return result.error();
if (!copy_to_user(peek_params.out_data, &result.value()))
return EFAULT; return EFAULT;
break; break;
} }