From owner-dev-commits-src-all@freebsd.org Fri May 21 17:28:25 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA9B0638501; Fri, 21 May 2021 17:28:25 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FmtqY499Wz4h07; Fri, 21 May 2021 17:28:25 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 7E5013C0199; Fri, 21 May 2021 17:28:24 +0000 (UTC) Date: Fri, 21 May 2021 17:28:24 +0000 From: Brooks Davis To: Marcin Wojtas Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: af949c590bd8 - main - Disable stack gap for ntpd during build. Message-ID: <20210521172824.GI60173@spindle.one-eyed-alien.net> References: <202105211334.14LDYqoa004343@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TeJTyD9hb8KJN2Jy" Content-Disposition: inline In-Reply-To: <202105211334.14LDYqoa004343@gitrepo.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4FmtqY499Wz4h07 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2021 17:28:25 -0000 --TeJTyD9hb8KJN2Jy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 21, 2021 at 01:34:52PM +0000, Marcin Wojtas wrote: > The branch main has been updated by mw: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Daf949c590bd8a00a5973b5875d= 7e0fa6832ea64a >=20 > commit af949c590bd8a00a5973b5875d7e0fa6832ea64a > Author: Marcin Wojtas > AuthorDate: 2021-05-21 09:29:22 +0000 > Commit: Marcin Wojtas > CommitDate: 2021-05-21 13:33:06 +0000 >=20 > Disable stack gap for ntpd during build. > =20 > When starting, ntpd calls setrlimit(2) to limit maximum size of its > stack. The stack limit chosen by ntpd is 200K, so when stack gap > is enabled, the stack gap is larger than this limit, which results > in ntpd crashing. > =20 > Submitted by: Dawid Gorecki > Reviewed by: cy, imp > Obtained from: Semihalf > Sponsored by: Stormshield > Differential Revision: https://reviews.freebsd.org/D29553 > --- > usr.sbin/ntp/ntpd/Makefile | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile > index 2d8a8b9d2a2d..b9c3a05547d4 100644 > --- a/usr.sbin/ntp/ntpd/Makefile > +++ b/usr.sbin/ntp/ntpd/Makefile > @@ -56,4 +56,7 @@ CLEANFILES+=3D .version version.c > version.c: > sh -e ${.CURDIR:H}/scripts/mkver ntpd > =20 > +afterbuild: > + ${ELFCTL} -e +noaslrstkgap ${PROG} > + > .include This is going to run every build and touch the file each time. It should be done as part of the link target like CTFMERGE. elfctl should also probably be taught not to write to the file if nothing changes. -- Brooks --TeJTyD9hb8KJN2Jy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJgp+23AAoJEKzQXbSebgfAUDIH/2csbDpn+XDbQQN4QAi5g/Qw Rqaqv16SytPZHXgTfDqWn7GwZ4POMtbLOEuvmZGwFEY4zSDLprgsjMEHJrtIhhHc zhlWb1Ua7s/ARNMEsZEcIcHKz0hlkCMdWh7xaWkI4uleTvhR6Q1YteqO0NfUPukm fqozGY0/QSipJm4q/e0pQkO2d3bzlcWVpyC0MXlhAZ/HGn2Oz9VecuYvKtcO12Eb P4BDnwkIUtLNwCv/IcP809jWJ1PZoxysiqtScXTjGRpPfBRZBGereOMNhW0ooxBg wjgjgTO1O2Xkb9RvglLLSotb18MsmQwGnFnhkljTc2+MCvOKMvE4GL8wWP55wf4= =VHRt -----END PGP SIGNATURE----- --TeJTyD9hb8KJN2Jy--