diff options
| author | dg <dg@FreeBSD.org> | 1994-08-04 03:06:48 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-08-04 03:06:48 +0000 |
| commit | 0711a9cff6e788c36f8cb95fb9682aaac7ad3c26 (patch) | |
| tree | f2060e88432520a2c43d879a7945ef77fac1f10e /sys/vm/vm_mmap.c | |
| parent | 9de51a06f5d7b329e5a4b7157ff464634db1d0c8 (diff) | |
| download | FreeBSD-src-0711a9cff6e788c36f8cb95fb9682aaac7ad3c26.zip FreeBSD-src-0711a9cff6e788c36f8cb95fb9682aaac7ad3c26.tar.gz | |
Integrated VM system improvements/fixes from FreeBSD-1.1.5.
Diffstat (limited to 'sys/vm/vm_mmap.c')
| -rw-r--r-- | sys/vm/vm_mmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index d0fb654..2c1624b 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id$ + * $Id: vm_mmap.c,v 1.3 1994/08/02 07:55:28 davidg Exp $ */ /* @@ -216,13 +216,13 @@ mmap(p, uap, retval) * Note that VM_*_ADDRESS are not constants due to casts (argh). */ if (flags & MAP_FIXED) { - if (VM_MAXUSER_ADDRESS > 0 && addr + size >= VM_MAXUSER_ADDRESS) + if (VM_MAXUSER_ADDRESS > 0 && addr + size > VM_MAXUSER_ADDRESS) return (EINVAL); #ifndef i386 if (VM_MIN_ADDRESS > 0 && addr < VM_MIN_ADDRESS) return (EINVAL); #endif - if (addr > addr + size) + if (addr + size < addr) return (EINVAL); } /* @@ -401,13 +401,13 @@ munmap(p, uap, retval) * Check for illegal addresses. Watch out for address wrap... * Note that VM_*_ADDRESS are not constants due to casts (argh). */ - if (VM_MAXUSER_ADDRESS > 0 && addr + size >= VM_MAXUSER_ADDRESS) + if (VM_MAXUSER_ADDRESS > 0 && addr + size > VM_MAXUSER_ADDRESS) return (EINVAL); #ifndef i386 if (VM_MIN_ADDRESS > 0 && addr < VM_MIN_ADDRESS) return (EINVAL); #endif - if (addr > addr + size) + if (addr + size < addr) return (EINVAL); map = &p->p_vmspace->vm_map; /* |
