Fill space between sections with traps, rather than nops.

diff --git a/sys/arch/amd64/conf/ld.script b/sys/arch/amd64/conf/ld.script
index c4dcae5..b43e2e4 100644 (file)
--- a/sys/arch/amd64/conf/ld.script
+++ b/sys/arch/amd64/conf/ld.script
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ld.script,v 1.5 2017/05/31 19:18:19 deraadt Exp $     */
+/*     $OpenBSD: ld.script,v 1.6 2017/06/21 20:08:53 deraadt Exp $     */
 
 /*
  * Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org>
@@ -54,7 +54,7 @@ SECTIONS
                __text_load = LOADADDR(.text);
                locore0.o(.text)
                *(.text .text.*)
-       } :text
+       } :text =0xcccccccc
        PROVIDE (__etext = .);
        PROVIDE (etext = .);
        _etext = .;
@@ -71,13 +71,13 @@ SECTIONS
                *(.rodata .rodata.*)
                *(.codepatch)
                *(.codepatchend)
-       } :rodata
+       } :rodata =0xcccccccc
        . = ALIGN(0x1000);
        __kernel_randomdata_phys = . & 0x7fffffff;
        .openbsd.randomdata : AT (__kernel_randomdata_phys)
        {
                *(.openbsd.randomdata)
-       } :rodata :openbsd_randomize
+       } :rodata :openbsd_randomize =0xcccccccc
        . = ALIGN(0x1000);
        PROVIDE (erodata = .);
        _erodata = .;
@@ -92,7 +92,7 @@ SECTIONS
                __data_size = SIZEOF(.data);
                __data_load = LOADADDR(.data);
                *(.data .data.*)
-       } :data
+       } :data =0xcccccccc
        . = ALIGN(0x1000);
        PROVIDE (edata = .);
        _edata = .;

diff --git a/sys/arch/i386/conf/ld.script b/sys/arch/i386/conf/ld.script
index 42444b0..1db9258 100644 (file)
--- a/sys/arch/i386/conf/ld.script
+++ b/sys/arch/i386/conf/ld.script
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ld.script,v 1.6 2017/05/31 19:18:18 deraadt Exp $     */
+/*     $OpenBSD: ld.script,v 1.7 2017/06/21 20:08:53 deraadt Exp $     */
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -55,7 +55,7 @@ SECTIONS
                __text_load = LOADADDR(.text);
                locore0.o(.text)
                *(.text .text.*)
-       } :text
+       } :text =0xcccccccc
        PROVIDE (__etext = .);
        PROVIDE (etext = .);
        _etext = .;
@@ -72,13 +72,13 @@ SECTIONS
                *(.rodata .rodata.*)
                *(.codepatch)
                *(.codepatchend)
-       } :rodata
+       } :rodata =0xcccccccc
        . = ALIGN(0x1000);
        __kernel_randomdata_phys = . & 0xfffffff;
        .openbsd.randomdata : AT (__kernel_randomdata_phys)
        {
                *(.openbsd.randomdata)
-       } :rodata :openbsd_randomize
+       } :rodata :openbsd_randomize =0xcccccccc
        . = ALIGN(0x1000);
        PROVIDE (erodata = .);
        _erodata = .;
@@ -93,7 +93,7 @@ SECTIONS
                __data_size = SIZEOF(.data);
                __data_load = LOADADDR(.data);
                *(.data .data.*)
-       } :data
+       } :data =0xcccccccc
        . = ALIGN(0x1000);
        PROVIDE (edata = .);
        _edata = .;