diff options
| author |   guenther <guenther@openbsd.org> | 2018-06-14 20:00:59 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2018-06-14 20:00:59 +0000 |
| commit | c2bc03ca4e79afec748c80915101c680fdc62834 (patch) | |
| tree | 5d1eec0698e6601b3c519a3abc357d697000366f | |
| parent | Clear the GPRs when entering the kernel from userspace so that (diff) | |
| download | wireguard-openbsd-c2bc03ca4e79afec748c80915101c680fdc62834.tar.xz wireguard-openbsd-c2bc03ca4e79afec748c80915101c680fdc62834.zip | |
Put the .openbsd.randomdata.retguard input section at the start of the
.openbsd.randomdata output section with symbols around it so that
hibernate+resume code can fix them up.
tested by mlarkin@ WIP
| -rw-r--r-- | sys/arch/amd64/conf/ld.script | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/ld.script b/sys/arch/amd64/conf/ld.script index e38604bae4c..21887db492c 100644 --- a/sys/arch/amd64/conf/ld.script +++ b/sys/arch/amd64/conf/ld.script @@ -1,4 +1,4 @@ -/* $OpenBSD: ld.script,v 1.10 2018/03/01 06:47:29 deraadt Exp $ */ +/* $OpenBSD: ld.script,v 1.11 2018/06/14 20:00:59 guenther Exp $ */ /* * Copyright (c) 2009 Tobias Weingartner <weingart@tepid.org> @@ -79,7 +79,10 @@ SECTIONS __kernel_randomdata_phys = (. - __kernel_virt_base) + 0x1000000; .openbsd.randomdata : AT (__kernel_randomdata_phys) { - *(.openbsd.randomdata) + __retguard_start = ABSOLUTE(.); + *(.openbsd.randomdata.retguard) + __retguard_end = ABSOLUTE(.); + *(.openbsd.randomdata .openbsd.randomdata.*) } :rodata :openbsd_randomize =0xcccccccc . = ALIGN(0x1000); PROVIDE (erodata = .); |