system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sshd: sync tracing disable with upstream

Browse source 
Old versions of FreeBSD do not support using id 0 to refer to the
current pid for procctl, so pass getpid() explicitly.

Although this is not required in current FreeBSD branches I am merging
it to reduce differences with upstream.

Obtained from:	OpenSSH commit 0f7e1eba5525
This commit is contained in:
Ed Maste 2022-11-07 12:17:15 -05:00
parent 82e4a85de5
commit 4232f36eda
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crypto/openssh/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