diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-11-16 12:30:52 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-11-16 12:30:52 +0000 |
| commit | 1e8cdc2e593c4e9ec7f4bdac2fbf48a4ad29f5b8 (patch) | |
| tree | 739083100a383196b1776cb84f65da8812dc079b /usr.sbin/procmap/procmap.c | |
| parent | Read your compiler output even when it succeeds. Add missing variable to (diff) | |
| download | wireguard-openbsd-1e8cdc2e593c4e9ec7f4bdac2fbf48a4ad29f5b8.tar.xz wireguard-openbsd-1e8cdc2e593c4e9ec7f4bdac2fbf48a4ad29f5b8.zip | |
Replace a plethora of historical protection options with just
PROT_NONE, PROT_READ, PROT_WRITE, and PROT_EXEC from mman.h.
PROT_MASK is introduced as the one true way of extracting those bits.
Remove UVM_ADV_* wrapper, using the standard names.
ok doug guenther kettenis
Diffstat (limited to 'usr.sbin/procmap/procmap.c')
| -rw-r--r-- | usr.sbin/procmap/procmap.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/procmap/procmap.c b/usr.sbin/procmap/procmap.c index f0365703a81..15fc3118e39 100644 --- a/usr.sbin/procmap/procmap.c +++ b/usr.sbin/procmap/procmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procmap.c,v 1.56 2014/09/08 01:47:06 guenther Exp $ */ +/* $OpenBSD: procmap.c,v 1.57 2014/11/16 12:31:01 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.1 2002/09/01 20:32:44 atatat Exp $ */ /* @@ -92,7 +92,7 @@ void *uvm_vnodeops, *uvm_deviceops, *aobj_pager; u_long kernel_map_addr; int debug, verbose; int print_all, print_map, print_maps, print_solaris, print_ddb, print_amap; -int rwx = VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE; +int rwx = PROT_READ | PROT_WRITE | PROT_EXEC; rlim_t maxssiz; struct sum { @@ -688,12 +688,12 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace, if (print_map) { printf("0x%lx 0x%lx %c%c%c %c%c%c %s %s %d %d %d", vme->start, vme->end, - (vme->protection & VM_PROT_READ) ? 'r' : '-', - (vme->protection & VM_PROT_WRITE) ? 'w' : '-', - (vme->protection & VM_PROT_EXECUTE) ? 'x' : '-', - (vme->max_protection & VM_PROT_READ) ? 'r' : '-', - (vme->max_protection & VM_PROT_WRITE) ? 'w' : '-', - (vme->max_protection & VM_PROT_EXECUTE) ? 'x' : '-', + (vme->protection & PROT_READ) ? 'r' : '-', + (vme->protection & PROT_WRITE) ? 'w' : '-', + (vme->protection & PROT_EXEC) ? 'x' : '-', + (vme->max_protection & PROT_READ) ? 'r' : '-', + (vme->max_protection & PROT_WRITE) ? 'w' : '-', + (vme->max_protection & PROT_EXEC) ? 'x' : '-', (vme->etype & UVM_ET_COPYONWRITE) ? "COW" : "NCOW", (vme->etype & UVM_ET_NEEDSCOPY) ? "NC" : "NNC", vme->inheritance, vme->wired_count, @@ -713,9 +713,9 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace, printf("%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %llu %s\n", (int)sizeof(void *) * 2, vme->start, (int)sizeof(void *) * 2, vme->end, - (vme->protection & VM_PROT_READ) ? 'r' : '-', - (vme->protection & VM_PROT_WRITE) ? 'w' : '-', - (vme->protection & VM_PROT_EXECUTE) ? 'x' : '-', + (vme->protection & PROT_READ) ? 'r' : '-', + (vme->protection & PROT_WRITE) ? 'w' : '-', + (vme->protection & PROT_EXEC) ? 'x' : '-', (vme->etype & UVM_ET_COPYONWRITE) ? 'p' : 's', (int)sizeof(void *) * 2, (unsigned long)vme->offset, @@ -748,11 +748,11 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace, prot[0] = '\0'; prot[1] = '\0'; - if (vme->protection & VM_PROT_READ) + if (vme->protection & PROT_READ) strlcat(prot, "/read", sizeof(prot)); - if (vme->protection & VM_PROT_WRITE) + if (vme->protection & PROT_WRITE) strlcat(prot, "/write", sizeof(prot)); - if (vme->protection & VM_PROT_EXECUTE) + if (vme->protection & PROT_EXEC) strlcat(prot, "/exec", sizeof(prot)); sz = (size_t)((vme->end - vme->start) / 1024); @@ -767,14 +767,14 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace, (int)sizeof(void *) * 2, vme->start, (int)sizeof(void *) * 2, vme->end - (vme->start != vme->end ? 1 : 0), (unsigned long)sz, (int)sizeof(void *) * 2, (unsigned long)vme->offset, - (vme->protection & VM_PROT_READ) ? 'r' : '-', - (vme->protection & VM_PROT_WRITE) ? 'w' : '-', - (vme->protection & VM_PROT_EXECUTE) ? 'x' : '-', + (vme->protection & PROT_READ) ? 'r' : '-', + (vme->protection & PROT_WRITE) ? 'w' : '-', + (vme->protection & PROT_EXEC) ? 'x' : '-', (vme->etype & UVM_ET_COPYONWRITE) ? 'p' : 's', (vme->etype & UVM_ET_NEEDSCOPY) ? '+' : '-', - (vme->max_protection & VM_PROT_READ) ? 'r' : '-', - (vme->max_protection & VM_PROT_WRITE) ? 'w' : '-', - (vme->max_protection & VM_PROT_EXECUTE) ? 'x' : '-', + (vme->max_protection & PROT_READ) ? 'r' : '-', + (vme->max_protection & PROT_WRITE) ? 'w' : '-', + (vme->max_protection & PROT_EXEC) ? 'x' : '-', vme->inheritance, vme->wired_count, vme->advice, major(dev), minor(dev), (unsigned long long)inode, name); if (A(vp)) |