From owner-svn-src-stable@freebsd.org Wed Mar 28 16:58:25 2018 Return-Path: Delivered-To: svn-src-stable@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 05D01F6C5C1; Wed, 28 Mar 2018 16:58:25 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AAE47770E8; Wed, 28 Mar 2018 16:58:24 +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 A17E45BA8; Wed, 28 Mar 2018 16:58:24 +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 w2SGwODP072251; Wed, 28 Mar 2018 16:58:24 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2SGwOXc072246; Wed, 28 Mar 2018 16:58:24 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803281658.w2SGwOXc072246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 28 Mar 2018 16:58:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331689 - in stable/11: contrib/binutils/ld/emulparams sys/conf X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in stable/11: contrib/binutils/ld/emulparams sys/conf X-SVN-Commit-Revision: 331689 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 16:58:25 -0000 Author: emaste Date: Wed Mar 28 16:58:24 2018 New Revision: 331689 URL: https://svnweb.freebsd.org/changeset/base/331689 Log: MFC r315522: use INT3 instead of NOP for x86 binary padding We should never end up executing the inter-function padding, so we are better off faulting than silently carrying on to whatever function happens to be next. Note that LLD does this by default. Sponsored by: The FreeBSD Foundation Modified: stable/11/contrib/binutils/ld/emulparams/elf_i386.sh stable/11/contrib/binutils/ld/emulparams/elf_x86_64.sh stable/11/sys/conf/ldscript.amd64 stable/11/sys/conf/ldscript.i386 Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/binutils/ld/emulparams/elf_i386.sh ============================================================================== --- stable/11/contrib/binutils/ld/emulparams/elf_i386.sh Wed Mar 28 16:55:45 2018 (r331688) +++ stable/11/contrib/binutils/ld/emulparams/elf_i386.sh Wed Mar 28 16:58:24 2018 (r331689) @@ -6,7 +6,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" NONPAGED_TEXT_START_ADDR=0x08048000 ARCH=i386 MACHINE= -NOP=0x90909090 +NOP=0xCCCCCCCC TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes Modified: stable/11/contrib/binutils/ld/emulparams/elf_x86_64.sh ============================================================================== --- stable/11/contrib/binutils/ld/emulparams/elf_x86_64.sh Wed Mar 28 16:55:45 2018 (r331688) +++ stable/11/contrib/binutils/ld/emulparams/elf_x86_64.sh Wed Mar 28 16:58:24 2018 (r331689) @@ -7,7 +7,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" NONPAGED_TEXT_START_ADDR=0x400000 ARCH="i386:x86-64" MACHINE= -NOP=0x90909090 +NOP=0xCCCCCCCC TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes Modified: stable/11/sys/conf/ldscript.amd64 ============================================================================== --- stable/11/sys/conf/ldscript.amd64 Wed Mar 28 16:55:45 2018 (r331688) +++ stable/11/sys/conf/ldscript.amd64 Wed Mar 28 16:58:24 2018 (r331689) @@ -56,7 +56,7 @@ SECTIONS .init : { KEEP (*(.init)) - } =0x90909090 + } =0xCCCCCCCC .plt : { *(.plt) } .text : { @@ -64,11 +64,11 @@ SECTIONS KEEP (*(.text.*personality*)) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - } =0x90909090 + } =0xCCCCCCCC .fini : { KEEP (*(.fini)) - } =0x90909090 + } =0xCCCCCCCC PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .); Modified: stable/11/sys/conf/ldscript.i386 ============================================================================== --- stable/11/sys/conf/ldscript.i386 Wed Mar 28 16:55:45 2018 (r331688) +++ stable/11/sys/conf/ldscript.i386 Wed Mar 28 16:58:24 2018 (r331689) @@ -44,7 +44,7 @@ SECTIONS .init : { KEEP (*(.init)) - } =0x90909090 + } =0xCCCCCCCC .plt : { *(.plt) } .text : { @@ -52,11 +52,11 @@ SECTIONS KEEP (*(.text.*personality*)) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - } =0x90909090 + } =0xCCCCCCCC .fini : { KEEP (*(.fini)) - } =0x90909090 + } =0xCCCCCCCC PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .);