From owner-svn-src-all@freebsd.org Thu Mar 28 02:12:34 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84D391565788; Thu, 28 Mar 2019 02:12:34 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 295D4757D6; Thu, 28 Mar 2019 02:12:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DEF5D18731; Thu, 28 Mar 2019 02:12:33 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2S2CXMu000734; Thu, 28 Mar 2019 02:12:33 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2S2CXoG000730; Thu, 28 Mar 2019 02:12:33 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201903280212.x2S2CXoG000730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 28 Mar 2019 02:12:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345625 - in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: contrib/elftoolchain/readelf lib/libc lib/libthr libexec/rtld-elf sys/sys X-SVN-Commit-Revision: 345625 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 295D4757D6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2019 02:12:34 -0000 Author: emaste Date: Thu Mar 28 02:12:32 2019 New Revision: 345625 URL: https://svnweb.freebsd.org/changeset/base/345625 Log: revert r341429 "disable BIND_NOW in libc, libthr, and rtld" r345620 by kib@ fixed the rtld issue that caused a crash at startup during resolution of libc's ifuncs with BIND_NOW. PR: 233333 Sponsored by: The FreeBSD Foundation Modified: head/contrib/elftoolchain/readelf/readelf.c head/lib/libc/Makefile head/lib/libthr/Makefile head/libexec/rtld-elf/Makefile head/sys/sys/elf_common.h Modified: head/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 01:12:44 2019 (r345624) +++ head/contrib/elftoolchain/readelf/readelf.c Thu Mar 28 02:12:32 2019 (r345625) @@ -3490,6 +3490,7 @@ dump_notes(struct readelf *re) static struct flag_desc note_feature_ctl_flags[] = { { NT_FREEBSD_FCTL_ASLR_DISABLE, "ASLR_DISABLE" }, + { NT_FREEBSD_FCTL_IMPLIED_MAX_PROT, "IMPLIED_MAX_PROT" }, { 0, NULL } }; Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Thu Mar 28 01:12:44 2019 (r345624) +++ head/lib/libc/Makefile Thu Mar 28 02:12:32 2019 (r345625) @@ -6,8 +6,6 @@ SHLIBDIR?= /lib .include -# BIND_NOW in libc results in segfault at startup (PR 233333) -MK_BIND_NOW= no # Force building of libc_pic.a MK_TOOLCHAIN= yes Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Thu Mar 28 01:12:44 2019 (r345624) +++ head/lib/libthr/Makefile Thu Mar 28 02:12:32 2019 (r345625) @@ -9,7 +9,6 @@ PACKAGE= clibs SHLIBDIR?= /lib .include -MK_BIND_NOW= no MK_SSP= no LIB=thr Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Thu Mar 28 01:12:44 2019 (r345624) +++ head/libexec/rtld-elf/Makefile Thu Mar 28 02:12:32 2019 (r345625) @@ -6,7 +6,6 @@ .include PACKAGE= clibs -MK_BIND_NOW= no MK_PIE= no # Always position independent using local rules MK_SSP= no Modified: head/sys/sys/elf_common.h ============================================================================== --- head/sys/sys/elf_common.h Thu Mar 28 01:12:44 2019 (r345624) +++ head/sys/sys/elf_common.h Thu Mar 28 02:12:32 2019 (r345625) @@ -763,7 +763,8 @@ typedef struct { #define NT_FREEBSD_FEATURE_CTL 4 /* NT_FREEBSD_FEATURE_CTL desc[0] bits */ -#define NT_FREEBSD_FCTL_ASLR_DISABLE 0x00000001 +#define NT_FREEBSD_FCTL_ASLR_DISABLE 0x00000001 +#define NT_FREEBSD_FCTL_IMPLIED_MAX_PROT 0x00000002 /* Values for n_type. Used in core files. */ #define NT_PRSTATUS 1 /* Process status. */