Changeset View
Changeset View
Standalone View
Standalone View
head/net/ntp/files/patch-ntpd_ntpd.c
| --- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800 | --- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800 | ||||
| +++ ntpd/ntpd.c 2019-09-20 12:11:54.469651000 -0700 | +++ ntpd/ntpd.c 2019-11-15 08:03:34.800596000 -0800 | ||||
| @@ -999,7 +999,7 @@ | @@ -138,6 +138,17 @@ | ||||
| # 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; | |||||
| @@ -402,6 +413,18 @@ | |||||
| 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 */ | |||||
| @@ -999,7 +1022,7 @@ | |||||
| # if defined(HAVE_MLOCKALL) | # if defined(HAVE_MLOCKALL) | ||||
| # ifdef HAVE_SETRLIMIT | # ifdef HAVE_SETRLIMIT | ||||
| ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k"); | ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k"); | ||||
| -# ifdef RLIMIT_MEMLOCK | -# ifdef RLIMIT_MEMLOCK | ||||
| +# if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && DFLT_RLIMIT_MEMLOCK != -1 | +# if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && DFLT_RLIMIT_MEMLOCK != -1 | ||||
| /* | /* | ||||
| * The default RLIMIT_MEMLOCK is very low on Linux systems. | * The default RLIMIT_MEMLOCK is very low on Linux systems. | ||||
| * Unless we increase this limit malloc calls are likely to | * Unless we increase this limit malloc calls are likely to | ||||