From: miod <miod@openbsd.org>
Date: Sat, 28 Dec 2013 17:57:14 +0000 (+0000)
Subject: Require an explicit PT_OPENBSD_RANDOMIZE program header in the kernel linker
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eba22f4dcb6867513c3011f812ef4c3c558c1085;p=openbsd

Require an explicit PT_OPENBSD_RANDOMIZE program header in the kernel linker
script (note that the amd64 linker script is currently not used).
Discussed with deraadt@
---

diff --git a/sys/arch/amd64/conf/kern.ldscript b/sys/arch/amd64/conf/kern.ldscript
index 4258dbf5d10..2b2b658d73b 100644
--- a/sys/arch/amd64/conf/kern.ldscript
+++ b/sys/arch/amd64/conf/kern.ldscript
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern.ldscript,v 1.2 2013/03/21 15:50:28 deraadt Exp $	*/
+/*	$OpenBSD: kern.ldscript,v 1.3 2013/12/28 17:57:14 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org>
@@ -26,6 +26,7 @@ PHDRS
 	rodata PT_LOAD;
 	data PT_LOAD;
 	bss PT_LOAD;
+	openbsd_randomize 0x65a3dbe6; /* PT_OPENBSD_RANDOMIZE */
 }
 
 /*
diff --git a/sys/arch/sparc64/conf/ld.script b/sys/arch/sparc64/conf/ld.script
index 897810c6765..f0180228907 100644
--- a/sys/arch/sparc64/conf/ld.script
+++ b/sys/arch/sparc64/conf/ld.script
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ld.script,v 1.1 2013/08/16 19:52:08 kettenis Exp $	*/
+/*	$OpenBSD: ld.script,v 1.2 2013/12/28 17:57:14 miod Exp $	*/
 
 /*
  * Copyright (c) 2013 Mark Kettenis <kettenis@openbsd.org>
@@ -24,6 +24,7 @@ PHDRS
 {
 	text PT_LOAD;
 	data PT_LOAD;
+	openbsd_randomize 0x65a3dbe6; /* PT_OPENBSD_RANDOMIZE */
 }
 
 SECTIONS