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 = .);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
