diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-21 06:40:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-21 06:40:41 +0000 |
| commit | ad82c02ab425844714cfb38ff58087c757dd5b1c (patch) | |
| tree | a5e86d4d28c1693fc2c2d7f45e42eba85ca1c6f7 /sys/uvm | |
| parent | 4514e45729b716416644c8986b32f547b5f48d78 (diff) | |
Kill kv_executable flag. We no longer allow requests for PROT_EXEC
mappings via this interface (nothing uses it, in any case)
ok uebayasi tedu
Diffstat (limited to 'sys/uvm')
| -rw-r--r-- | sys/uvm/uvm_extern.h | 3 | ||||
| -rw-r--r-- | sys/uvm/uvm_km.c | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h index 8780317d9bb..3727296d325 100644 --- a/sys/uvm/uvm_extern.h +++ b/sys/uvm/uvm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_extern.h,v 1.123 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: uvm_extern.h,v 1.124 2014/11/21 06:40:40 deraadt Exp $ */ /* $NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $ */ /* @@ -337,7 +337,6 @@ struct kmem_va_mode { vsize_t kv_align; char kv_wait; char kv_singlepage; - char kv_executable; }; /* diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c index d375bc26014..d2424c4ea5a 100644 --- a/sys/uvm/uvm_km.c +++ b/sys/uvm/uvm_km.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_km.c,v 1.119 2014/11/17 04:31:08 deraadt Exp $ */ +/* $OpenBSD: uvm_km.c,v 1.120 2014/11/21 06:40:40 deraadt Exp $ */ /* $NetBSD: uvm_km.c,v 1.42 2001/01/14 02:10:01 thorpej Exp $ */ /* @@ -842,7 +842,7 @@ km_alloc(size_t sz, const struct kmem_va_mode *kv, } #ifdef __HAVE_PMAP_DIRECT - if (kv->kv_align || kv->kv_executable) + if (kv->kv_align) goto alloc_va; #if 1 /* @@ -874,11 +874,7 @@ km_alloc(size_t sz, const struct kmem_va_mode *kv, } #endif alloc_va: - if (kv->kv_executable) { - prot = PROT_READ | PROT_WRITE | PROT_EXEC; - } else { - prot = PROT_READ | PROT_WRITE; - } + prot = PROT_READ | PROT_WRITE; if (kp->kp_pageable) { KASSERT(kp->kp_object); |