diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2021-08-16 15:05:50 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2021-10-15 23:06:26 +0000 |
| commit | fc393054398ea50fb0cee52704e9385afe888b48 (patch) | |
| tree | 829d754244da807494901098c53e17134a616675 | |
| parent | 733a832fb515ef9ebf9d584896962fd28e714d0b (diff) | |
| download | src-fc393054398ea50fb0cee52704e9385afe888b48.tar.gz src-fc393054398ea50fb0cee52704e9385afe888b48.zip | |
ntp: Revert "Disable ntpd stack gap. When ASLR with STACK GAP != 0 ntpd suffers SIGSEGV."
This reverts commit 55263180628a386ad38b4b6621919220b137f770 because the
underlying problem was fixed by 889b56c8cd84c9a9f2d9e3b019c154d6f14d9021.
MFC after: 1 month
| -rw-r--r-- | contrib/ntp/ntpd/ntpd.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/contrib/ntp/ntpd/ntpd.c b/contrib/ntp/ntpd/ntpd.c index aac315c430da..a5591de79ff5 100644 --- a/contrib/ntp/ntpd/ntpd.c +++ b/contrib/ntp/ntpd/ntpd.c @@ -145,17 +145,6 @@ # include <seccomp.h> #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 # include <dns_sd.h> DNSServiceRef mdns; @@ -438,18 +427,6 @@ main( 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); } #endif /* !SYS_WINNT */ |