d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only the super-user should be able to wire pages via the mlock() family

Browse Source 
of system calls at this time.  Remove various #ifdef's to enforce this.
This commit is contained in:
Bruce M Simpson 2003-10-06 01:59:04 +00:00
parent dad5d4e08c
commit 11f7ddc563
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/vm/vm_mmap.c
View File

@ -1037,7 +1037,7 @@ mlock(td, uap)
if (atop(size) + cnt.v_wire_count > vm_page_max_wired) if (atop(size) + cnt.v_wire_count > vm_page_max_wired)
return (EAGAIN); return (EAGAIN);
#ifdef pmap_wired_count #if 0
if (size + ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map))) > if (size + ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map))) >
td->td_proc->p_rlimit[RLIMIT_MEMLOCK].rlim_cur) td->td_proc->p_rlimit[RLIMIT_MEMLOCK].rlim_cur)
return (ENOMEM); return (ENOMEM);
@ -1075,7 +1075,7 @@ mlockall(td, uap)
if ((uap->how == 0) || ((uap->how & ~(MCL_CURRENT|MCL_FUTURE)) != 0)) if ((uap->how == 0) || ((uap->how & ~(MCL_CURRENT|MCL_FUTURE)) != 0))
return (EINVAL); return (EINVAL);
#ifdef pmap_wired_count #if 0
/* /*
* If wiring all pages in the process would cause it to exceed * If wiring all pages in the process would cause it to exceed
* a hard resource limit, return ENOMEM. * a hard resource limit, return ENOMEM.
@ -1129,11 +1129,9 @@ munlockall(td, uap)
int error; int error;
map = &td->td_proc->p_vmspace->vm_map; map = &td->td_proc->p_vmspace->vm_map;
#ifndef pmap_wired_count
error = suser(td); error = suser(td);
if (error) if (error)
return (error); return (error);
#endif
/* Clear the MAP_WIREFUTURE flag from this vm_map. */ /* Clear the MAP_WIREFUTURE flag from this vm_map. */
vm_map_lock(map); vm_map_lock(map);
@ -1177,11 +1175,9 @@ munlock(td, uap)
if (addr + size < addr) if (addr + size < addr)
return (EINVAL); return (EINVAL);
#ifndef pmap_wired_count
error = suser(td); error = suser(td);
if (error) if (error)
return (error); return (error);
#endif
error = vm_map_unwire(&td->td_proc->p_vmspace->vm_map, addr, error = vm_map_unwire(&td->td_proc->p_vmspace->vm_map, addr,
addr + size, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); addr + size, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES);