70 lines
1.7 KiB
Plaintext
70 lines
1.7 KiB
Plaintext
Index: base/debug/debugger_posix.cc
|
|
--- base/debug/debugger_posix.cc.orig
|
|
+++ base/debug/debugger_posix.cc
|
|
@@ -35,6 +35,10 @@
|
|
#include <sys/sysctl.h>
|
|
#endif
|
|
|
|
+#if BUILDFLAG(IS_OPENBSD)
|
|
+#include <sys/proc.h>
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(IS_FREEBSD)
|
|
#include <sys/user.h>
|
|
#endif
|
|
@@ -95,32 +99,51 @@ bool BeingDebugged() {
|
|
|
|
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
|
// binary interfaces may change.
|
|
+#if BUILDFLAG(IS_OPENBSD)
|
|
+ struct kinfo_proc *info;
|
|
+ size_t info_size;
|
|
+#else
|
|
struct kinfo_proc info;
|
|
size_t info_size = sizeof(info);
|
|
+#endif
|
|
|
|
#if BUILDFLAG(IS_OPENBSD)
|
|
if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
|
|
return -1;
|
|
|
|
mib[5] = (info_size / sizeof(struct kinfo_proc));
|
|
+ if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) {
|
|
+ is_set = true;
|
|
+ being_debugged = false;
|
|
+ return being_debugged;
|
|
+ }
|
|
+
|
|
+ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0);
|
|
#endif
|
|
|
|
+#if !BUILDFLAG(IS_OPENBSD)
|
|
int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0);
|
|
+#endif
|
|
DCHECK_EQ(sysctl_result, 0);
|
|
if (sysctl_result != 0) {
|
|
is_set = true;
|
|
being_debugged = false;
|
|
- return being_debugged;
|
|
+ goto out;
|
|
}
|
|
|
|
// This process is being debugged if the P_TRACED flag is set.
|
|
is_set = true;
|
|
#if BUILDFLAG(IS_FREEBSD)
|
|
being_debugged = (info.ki_flag & P_TRACED) != 0;
|
|
-#elif BUILDFLAG(IS_BSD)
|
|
- being_debugged = (info.p_flag & P_TRACED) != 0;
|
|
+#elif BUILDFLAG(IS_OPENBSD)
|
|
+ being_debugged = (info->p_psflags & PS_TRACED) != 0;
|
|
#else
|
|
being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
|
|
+#endif
|
|
+
|
|
+out:
|
|
+#if BUILDFLAG(IS_OPENBSD)
|
|
+ free(info);
|
|
#endif
|
|
return being_debugged;
|
|
}
|