From nobody Mon Jan 3 23:30:00 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 82C3E193AFB5; Mon, 3 Jan 2022 23:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSX601tWLz4fYx; Mon, 3 Jan 2022 23:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2116963E2; Mon, 3 Jan 2022 23:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203NU0p8028684; Mon, 3 Jan 2022 23:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203NU0KG028681; Mon, 3 Jan 2022 23:30:00 GMT (envelope-from git) Date: Mon, 3 Jan 2022 23:30:00 GMT Message-Id: <202201032330.203NU0KG028681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 12c711f167ae - stable/13 - ntp: Revert "Disable ntpd stack gap. When ASLR with STACK GAP != 0 ntpd suffers SIGSEGV." List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 12c711f167ae6a3d9db66d7a59d4556b9a4ffbb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641252600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgHpEBLxTbbq241uW89vwa7xtjsRLZkS/3F4xzhR/Kg=; b=myiFSiZE2on3fErUQBtI6zhtGYRL+H77OMYbA1LWgZt0Adz4p94ZUqCrI26aglP2BPbwLI DF0czPuD0NKGxhLYqybaamOMBHc88g9XCLIn5g+MJdgqo1Nn77sqkbXhaQm2A4s3YUKu+h kLhgjqYWAFIVguHplyXRCbz0oJ0GbcZqXz8l+eyNQQV9L9LqjkrH8hCItIkYRHszsoLYqQ pGklnmwWkywoVTnkB+iZh+H/lcJpIRDZBiQgWnmFv09bBRhtCbCV3cMaA+z3MwllBIroRu 6k3EmJMA1vsHCCcl0twvuQGAX1w/y5vS+U2+kO4erx2z30r16do/Vb6ERRhYBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641252600; a=rsa-sha256; cv=none; b=n60baLYugjX4o3ahhNnmyk1FIkzFakHCg8GsHIkFuIHJVcj6mdtBeuMML+T2Jf7QKFa+8A VR9jrcgSL5iRcQIo1wDkUKUmVk8fBOYfhXVMhBkep8dbuQdPeEDVB23FhLt+W+eX4uli6P 5Fqh957r6gs6DVndWfSpDrQWnSMuEaKr5J0MpvXlBENZLdZDmeZ/5bW4I9guFnfF25I8BN gYZ27SLhsSUeq0mf4yO4yL5L/vutJMMmg7U5vXuYdukswgE8axLkH4/R5ZsZ5ifTJ4y8R8 AfSD4TsCe8wVt1MO9k0bSOg1rbccuW4u3dOYN5Lj7CWG3NwJwH3Jttzdemnz5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=12c711f167ae6a3d9db66d7a59d4556b9a4ffbb5 commit 12c711f167ae6a3d9db66d7a59d4556b9a4ffbb5 Author: Cy Schubert AuthorDate: 2021-08-16 15:05:50 +0000 Commit: Cy Schubert CommitDate: 2022-01-03 23:04:05 +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. (cherry picked from commit fc393054398ea50fb0cee52704e9385afe888b48) --- 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 #endif /* LIBSECCOMP and KERN_SECCOMP */ -#ifdef __FreeBSD__ -#include -#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 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 */