summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-06-03 16:20:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-06-03 16:20:30 +0000
commitedea4891e71588dc4acb92748e90875a49e78805 (patch)
tree1b07eecb46e906a55fd97689fb147855eb65d2a4
parent33aa3b42fe067873a4d66eafddf0196d2039cc0c (diff)
randomness might be broken, but this change
a) chooses incorrect kernel memory on the macppc b) perhaps on zaurus too, which does not make it to copyright c) was not tested on those platforms before commit
-rw-r--r--sys/uvm/uvm_map.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index 1d22ee61ec6..2f4359c49d6 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_map.c,v 1.139 2011/06/01 22:29:25 ariane Exp $ */
+/* $OpenBSD: uvm_map.c,v 1.140 2011/06/03 16:20:29 deraadt Exp $ */
/* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */
/*
@@ -924,8 +924,7 @@ pmap_prefer_retry:
* a page.
*/
sel_addr &= ~(align - 1);
- if (pmap_align != 0)
- sel_addr &= ~(pmap_align - 1);
+ sel_addr &= ~(pmap_align - 1);
KDASSERT(sel_addr <= sel_max - sel_min);
/*