Date: Fri, 15 Oct 2021 23:09:46 GMT From: Cy Schubert <cy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fc393054398e - main - ntp: Revert "Disable ntpd stack gap. When ASLR with STACK GAP != 0 ntpd suffers SIGSEGV." Message-ID: <202110152309.19FN9kW1019799@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fc393054398ea50fb0cee52704e9385afe888b48 commit fc393054398ea50fb0cee52704e9385afe888b48 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2021-08-16 15:05:50 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2021-10-15 23:06:26 +0000 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 --- contrib/ntp/ntpd/ntpd.c | 23 ----------------------- 1 file changed, 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110152309.19FN9kW1019799>