ntp: Revert "Disable ntpd stack gap. When ASLR with STACK GAP != 0 ntpd suffers SIGSEGV."
This reverts commit5526318062
because the underlying problem was fixed by889b56c8cd
. MFC after: 1 month
This commit is contained in:
parent
733a832fb5
commit
fc39305439
@ -145,17 +145,6 @@
|
|||||||
# include <seccomp.h>
|
# include <seccomp.h>
|
||||||
#endif /* LIBSECCOMP and KERN_SECCOMP */
|
#endif /* LIBSECCOMP and KERN_SECCOMP */
|
||||||
|
|
||||||
#ifdef __FreeBSD__
|
|
||||||
#include <sys/procctl.h>
|
|
||||||
#ifndef PROC_STACKGAP_CTL
|
|
||||||
/*
|
|
||||||
* Even if we compile on an older system we can still run on a newer one.
|
|
||||||
*/
|
|
||||||
#define PROC_STACKGAP_CTL 17
|
|
||||||
#define PROC_STACKGAP_DISABLE 0x0002
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_DNSREGISTRATION
|
#ifdef HAVE_DNSREGISTRATION
|
||||||
# include <dns_sd.h>
|
# include <dns_sd.h>
|
||||||
DNSServiceRef mdns;
|
DNSServiceRef mdns;
|
||||||
@ -438,18 +427,6 @@ main(
|
|||||||
char *argv[]
|
char *argv[]
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
# ifdef __FreeBSD__
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* We Must disable ASLR stack gap on FreeBSD to avoid a
|
|
||||||
* segfault. See PR/241421 and PR/241960.
|
|
||||||
*/
|
|
||||||
int aslr_var = PROC_STACKGAP_DISABLE;
|
|
||||||
|
|
||||||
pid_t my_pid = getpid();
|
|
||||||
procctl(P_PID, my_pid, PROC_STACKGAP_CTL, &aslr_var);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
return ntpdmain(argc, argv);
|
return ntpdmain(argc, argv);
|
||||||
}
|
}
|
||||||
#endif /* !SYS_WINNT */
|
#endif /* !SYS_WINNT */
|
||||||
|
Loading…
Reference in New Issue
Block a user