Date: Mon, 18 Nov 2019 13:33:50 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r517868 - in branches/2019Q4/net: ntp ntp-devel ntp-devel/files ntp/files Message-ID: <201911181333.xAIDXomJ068429@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Nov 18 13:33:50 2019 New Revision: 517868 URL: https://svnweb.freebsd.org/changeset/ports/517868 Log: MFH: r515926 r517694 patch-ntpd_ntp.c should really be named patch-ntpd_ntpd.c as it patches ntpd/ntpd.c. Disable ntpd stack gap. When ASLR with STACK GAP != 0 ntpd suffers SIGSEGV. PR: 241421, 241960 Reported by: Vladimir Zakharov <zakharov.vv@gmail.com>, dewayne@heuristicsystems.com.au Reviewed by: kib, imp (previous version), ian (suggestion) Differential Revision: https://reviews.freebsd.org/D22358 Approved by: portmgr (joneum) Added: branches/2019Q4/net/ntp-devel/files/patch-ntpd_ntpd.c - copied, changed from r515926, head/net/ntp-devel/files/patch-ntpd_ntpd.c branches/2019Q4/net/ntp/files/patch-ntpd_ntpd.c - copied, changed from r515926, head/net/ntp/files/patch-ntpd_ntpd.c Deleted: branches/2019Q4/net/ntp-devel/files/patch-ntpd_ntp.c branches/2019Q4/net/ntp/files/patch-ntpd_ntp.c Modified: branches/2019Q4/net/ntp-devel/Makefile branches/2019Q4/net/ntp/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/net/ntp-devel/Makefile ============================================================================== --- branches/2019Q4/net/ntp-devel/Makefile Mon Nov 18 12:34:58 2019 (r517867) +++ branches/2019Q4/net/ntp-devel/Makefile Mon Nov 18 13:33:50 2019 (r517868) @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.3.99 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ Copied and modified: branches/2019Q4/net/ntp-devel/files/patch-ntpd_ntpd.c (from r515926, head/net/ntp-devel/files/patch-ntpd_ntpd.c) ============================================================================== --- head/net/ntp-devel/files/patch-ntpd_ntpd.c Mon Oct 28 20:19:03 2019 (r515926, copy source) +++ branches/2019Q4/net/ntp-devel/files/patch-ntpd_ntpd.c Mon Nov 18 13:33:50 2019 (r517868) @@ -1,6 +1,43 @@ --- ntpd/ntpd.c.orig 2019-06-07 01:59:15.000000000 -0700 -+++ ntpd/ntpd.c 2019-09-20 12:13:28.810552000 -0700 -@@ -999,7 +999,7 @@ ++++ ntpd/ntpd.c 2019-11-15 08:06:37.290504000 -0800 +@@ -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) # ifdef HAVE_SETRLIMIT ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k"); Modified: branches/2019Q4/net/ntp/Makefile ============================================================================== --- branches/2019Q4/net/ntp/Makefile Mon Nov 18 12:34:58 2019 (r517867) +++ branches/2019Q4/net/ntp/Makefile Mon Nov 18 13:33:50 2019 (r517868) @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ Copied and modified: branches/2019Q4/net/ntp/files/patch-ntpd_ntpd.c (from r515926, head/net/ntp/files/patch-ntpd_ntpd.c) ============================================================================== --- head/net/ntp/files/patch-ntpd_ntpd.c Mon Oct 28 20:19:03 2019 (r515926, copy source) +++ branches/2019Q4/net/ntp/files/patch-ntpd_ntpd.c Mon Nov 18 13:33:50 2019 (r517868) @@ -1,6 +1,43 @@ --- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800 -+++ ntpd/ntpd.c 2019-09-20 12:11:54.469651000 -0700 -@@ -999,7 +999,7 @@ ++++ ntpd/ntpd.c 2019-11-15 08:03:34.800596000 -0800 +@@ -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) # ifdef HAVE_SETRLIMIT ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911181333.xAIDXomJ068429>