RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:47:34 +00:00
Code Issues Activity Actions

Kernel: Don't dump perfcore for non-dumpable processes

Browse source 
Fixes #4904
This commit is contained in:
Andreas Kling 2021-01-11 18:53:45 +01:00
parent cf3d2411fa
commit 5c73c1bff8
2 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Kernel/Process.cpp
View file

@ -590,6 +590,35 @@ KResultOr<String> Process::get_syscall_path_argument(const Syscall::StringArgume
return get_syscall_path_argument(path.characters, path.length); return get_syscall_path_argument(path.characters, path.length);
} }
bool Process::dump_core()
{
ASSERT(is_dumpable());
ASSERT(should_core_dump());
dbgln("Generating coredump for pid: {}", m_pid.value());
auto coredump_path = String::formatted("/tmp/coredump/{}_{}_{}", name(), m_pid.value(), RTC::now());
auto coredump = CoreDump::create(*this, coredump_path);
if (!coredump)
return false;
return !coredump->write().is_error();
}
bool Process::dump_perfcore()
{
ASSERT(is_dumpable());
ASSERT(m_perf_event_buffer);
dbgln("Generating perfcore for pid: {}", m_pid.value());
auto description_or_error = VFS::the().open(String::formatted("perfcore.{}", m_pid.value()), O_CREAT | O_EXCL, 0400, current_directory(), UidAndGid { m_uid, m_gid });
if (description_or_error.is_error())
return false;
auto& description = description_or_error.value();
auto json = m_perf_event_buffer->to_json(m_pid, m_executable ? m_executable->absolute_path() : "");
if (!json)
return false;
auto json_buffer = UserOrKernelBuffer::for_kernel_buffer(json->data());
return !description->write(json_buffer, json->size()).is_error();
}
void Process::finalize() void Process::finalize()
{ {
ASSERT(Thread::current() == g_finalizer); ASSERT(Thread::current() == g_finalizer);
@ -597,35 +626,11 @@ void Process::finalize()
dbg() << "Finalizing process " << *this; dbg() << "Finalizing process " << *this;
#endif #endif
if (m_should_dump_core) { if (is_dumpable()) {
dbgln("Generating coredump for pid: {}", m_pid.value()); if (m_should_dump_core)
dump_core();
auto coredump_path = String::formatted("/tmp/coredump/{}_{}_{}", name(), m_pid.value(), RTC::now()); if (m_perf_event_buffer)
auto coredump = CoreDump::create(*this, coredump_path); dump_perfcore();
if (coredump) {
auto result = coredump->write();
if (result.is_error())
dbgln("Core dump generation failed: {}", result.error());
} else {
dbgln("Could not create coredump");
}
}
if (m_perf_event_buffer) {
auto description_or_error = VFS::the().open(String::formatted("perfcore.{}", m_pid.value()), O_CREAT | O_EXCL, 0400, current_directory(), UidAndGid { m_uid, m_gid });
if (!description_or_error.is_error()) {
auto& description = description_or_error.value();
auto json = m_perf_event_buffer->to_json(m_pid, m_executable ? m_executable->absolute_path() : "");
if (!json) {
dbgln("Error generating perfcore JSON");
} else {
auto json_buffer = UserOrKernelBuffer::for_kernel_buffer(json->data());
auto result = description->write(json_buffer, json->size());
if (result.is_error()) {
dbgln("Error while writing perfcore file: {}", result.error().error());
}
}
}
} }
if (m_alarm_timer) if (m_alarm_timer)
@ -918,5 +923,4 @@ PerformanceEventBuffer& Process::ensure_perf_events()
m_perf_event_buffer = make<PerformanceEventBuffer>(); m_perf_event_buffer = make<PerformanceEventBuffer>();
return *m_perf_event_buffer; return *m_perf_event_buffer;
} }
} }

2
Kernel/Process.h
View file

@ -527,6 +527,8 @@ private:
void kill_threads_except_self(); void kill_threads_except_self();
void kill_all_threads(); void kill_all_threads();
bool dump_core();
bool dump_perfcore();
int do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description, Thread*& new_main_thread, u32& prev_flags, const Elf32_Ehdr& main_program_header); int do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description, Thread*& new_main_thread, u32& prev_flags, const Elf32_Ehdr& main_program_header);
ssize_t do_write(FileDescription&, const UserOrKernelBuffer&, size_t); ssize_t do_write(FileDescription&, const UserOrKernelBuffer&, size_t);