diff options
| author |   kettenis <kettenis@openbsd.org> | 2016-07-13 17:49:00 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2016-07-13 17:49:00 +0000 |
| commit | cb8f6a63c110b66bdb903503ed3db1fda9dc7216 (patch) | |
| tree | dd28f668abe9c902fd3bd89638a050a07682f26f /sys | |
| parent | Move ARP processing back to the KERNEL_LOCK()ed task until the race (diff) | |
| download | wireguard-openbsd-cb8f6a63c110b66bdb903503ed3db1fda9dc7216.tar.xz wireguard-openbsd-cb8f6a63c110b66bdb903503ed3db1fda9dc7216.zip | |
Revert previous; the __MAP_NOFAULT test is inverted and the commit message is
wrong.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/uvm/uvm_mmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c index 66c5b81a1f3..ac921faa0fa 100644 --- a/sys/uvm/uvm_mmap.c +++ b/sys/uvm/uvm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_mmap.c,v 1.135 2016/07/13 15:57:35 kettenis Exp $ */ +/* $OpenBSD: uvm_mmap.c,v 1.136 2016/07/13 17:49:00 kettenis Exp $ */ /* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */ /* @@ -521,7 +521,7 @@ sys_mmap(struct proc *p, void *v, register_t *retval) /* MAP_PRIVATE mappings can always write to */ maxprot |= PROT_WRITE; } - if ((flags & MAP_ANON) != 0 || (flags & __MAP_NOFAULT) == 0 || + if ((flags & MAP_ANON) != 0 || ((flags & MAP_PRIVATE) != 0 && (prot & PROT_WRITE) != 0)) { if (p->p_rlimit[RLIMIT_DATA].rlim_cur < size || p->p_rlimit[RLIMIT_DATA].rlim_cur - size < @@ -541,7 +541,7 @@ sys_mmap(struct proc *p, void *v, register_t *retval) is_anon: /* label for SunOS style /dev/zero */ - if ((flags & MAP_ANON) != 0 || (flags & __MAP_NOFAULT) == 0 || + if ((flags & MAP_ANON) != 0 || ((flags & MAP_PRIVATE) != 0 && (prot & PROT_WRITE) != 0)) { if (p->p_rlimit[RLIMIT_DATA].rlim_cur < size || p->p_rlimit[RLIMIT_DATA].rlim_cur - size < |