RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-31 23:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tracing disable on FreeBSD.

Browse Source 
Some versions of FreeBSD do not support using id 0 to refer to the
current pid for procctl, so pass getpid() explicitly.  From
emaste at freebsd.org.
This commit is contained in:
Darren Tucker 2022-11-06 10:50:01 +11:00
parent 32fddb982f
commit 0f7e1eba55
No known key found for this signature in database
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform-tracing.c
View File

@ -32,6 +32,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include "log.h"
@ -42,7 +43,16 @@ platform_disable_tracing(int strict)
/* On FreeBSD, we should make this process untraceable */
int disable_trace = PROC_TRACE_CTL_DISABLE;
if (procctl(P_PID, 0, PROC_TRACE_CTL, &disable_trace) && strict)
/*
* On FreeBSD, we should make this process untraceable.
* pid=0 means "this process" and but some older kernels do not
* understand that, so retry with our own pid before failing.
*/
if (procctl(P_PID, 0, PROC_TRACE_CTL, &disable_trace) == 0)
return;
if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &disable_trace) == 0)
return;
if (strict)
fatal("unable to make the process untraceable: %s",
strerror(errno));
#endif