dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #16432 - openbsd fork+attach EBUSY issue ##debug (#16505) 

* Implement is_pid_already_attached() for OpenBSD
This commit is contained in:
pancake 2020-04-11 01:56:50 +02:00 committed by GitHub
parent 0a2f9dd29e
commit e9eb1a2ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/io/p/io_debug.c
View File

@ -197,7 +197,7 @@ static void inferior_abort_handler(int pid) {
}
#endif
static void trace_me (void) {
static void trace_me(void) {
#if __APPLE__
r_sys_signal (SIGTRAP, SIG_IGN); //NEED BY STEP
#endif

29
libr/io/p/io_ptrace.c
View File

@ -178,14 +178,18 @@ static bool __plugin_open(RIO *io, const char *file, bool many) {
return false;
}
static inline bool is_pid_already_attached (RIO *io, int pid, void *data) {
static inline bool is_pid_already_attached(RIO *io, int pid) {
#if defined(__linux__)
siginfo_t *sig = (siginfo_t *)data;
return -1 != r_io_ptrace (io, PTRACE_GETSIGINFO, pid, NULL, sig);
siginfo_t sig = { 0 };
return r_io_ptrace (io, PTRACE_GETSIGINFO, pid, NULL, &sig) != -1;
#elif defined(__FreeBSD__)
struct ptrace_lwpinfo *info = (struct ptrace_lwpinfo *)data;
int len = (int)sizeof (*info);
return -1 != r_io_ptrace (io, PT_LWPINFO, pid, info, len);
struct ptrace_lwpinfo info = { 0 };
int len = (int)sizeof (info);
return r_io_ptrace (io, PT_LWPINFO, pid, &info, len) != -1;
#elif __OpenBSD__
ptrace_state_t state = { 0 };
int len = (int)sizeof (state);
return r_io_ptrace (io, PT_GET_PROCESS_STATE, pid, &state, len) != -1;
#else
return false;
#endif
@ -194,13 +198,6 @@ static inline bool is_pid_already_attached (RIO *io, int pid, void *data) {
static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
RIODesc *desc = NULL;
int ret = -1;
#if defined(__linux__)
siginfo_t sig = { 0 };
#elif defined(__FreeBSD__)
struct ptrace_lwpinfo sig = { 0 };
#else
int sig = 0;
#endif
if (!__plugin_open (io, file, 0)) {
return NULL;
@ -210,7 +207,7 @@ static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
// Safely check if the PID has already been attached to avoid printing errors
// and attempt attaching on failure
if (!is_pid_already_attached(io, pid, &sig)) {
if (!is_pid_already_attached (io, pid)) {
ret = r_io_ptrace (io, PTRACE_ATTACH, pid, 0, 0);
if (ret == -1) {
#ifdef __ANDROID__
@ -225,9 +222,11 @@ static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
perror ("ptrace: Cannot attach");
eprintf ("ERRNO: %d (EINVAL)\n", errno);
break;
default:
break;
}
#endif
return NULL;
#endif
} else if (__waitpid (pid)) {
ret = pid;
} else {