diff options
| author |   matthew <matthew@openbsd.org> | 2012-06-06 04:54:36 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2012-06-06 04:54:36 +0000 |
| commit | bbbbe83428afbb2b802800949c58aeaee141317c (patch) | |
| tree | 1699c9e41a3ef407746e72138d5e5f6019d98bf6 | |
| parent | EVFILT_SIGNAL and EVFILT_PROC events need to track the process they're (diff) | |
| download | wireguard-openbsd-bbbbe83428afbb2b802800949c58aeaee141317c.tar.xz wireguard-openbsd-bbbbe83428afbb2b802800949c58aeaee141317c.zip | |
Fix address-space randomization that was accidentally disabled in
uvm_addr.c r1.3.
ok deraadt, tedu
| -rw-r--r-- | sys/uvm/uvm_addr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c index 82c10a350a5..298c24aa2a8 100644 --- a/sys/uvm/uvm_addr.c +++ b/sys/uvm/uvm_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_addr.c,v 1.3 2012/04/11 11:23:22 ariane Exp $ */ +/* $OpenBSD: uvm_addr.c,v 1.4 2012/06/06 04:54:36 matthew Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -629,7 +629,10 @@ uaddr_rnd_select(struct vm_map *map, struct uvm_addr_state *uaddr, MIN(uaddr->uaddr_maxaddr, VMMAP_FREE_END(entry)), sz, align, offset, before_gap, after_gap) == 0) { *entry_out = entry; - *addr_out = low_addr; + if (hint >= low_addr && hint <= high_addr) + *addr_out = hint; + else + *addr_out = low_addr; return 0; } |