When vm_mmap() is used to map a vm object into a kernel vm_map, it

makes no sense to check the size of the kernel vm_map against the
user-level resource limits for the calling process.

Reviewed by:	kib
This commit is contained in:
Alan Cox 2012-02-16 06:45:51 +00:00
parent c1cb99c965
commit a649296959

View File

@ -1438,18 +1438,18 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
size = round_page(size); size = round_page(size);
PROC_LOCK(td->td_proc); if (map == &td->td_proc->p_vmspace->vm_map) {
if (td->td_proc->p_vmspace->vm_map.size + size > PROC_LOCK(td->td_proc);
lim_cur(td->td_proc, RLIMIT_VMEM)) { if (map->size + size > lim_cur(td->td_proc, RLIMIT_VMEM)) {
PROC_UNLOCK(td->td_proc);
return (ENOMEM);
}
if (racct_set(td->td_proc, RACCT_VMEM, map->size + size)) {
PROC_UNLOCK(td->td_proc);
return (ENOMEM);
}
PROC_UNLOCK(td->td_proc); PROC_UNLOCK(td->td_proc);
return (ENOMEM);
} }
if (racct_set(td->td_proc, RACCT_VMEM,
td->td_proc->p_vmspace->vm_map.size + size)) {
PROC_UNLOCK(td->td_proc);
return (ENOMEM);
}
PROC_UNLOCK(td->td_proc);
/* /*
* We currently can only deal with page aligned file offsets. * We currently can only deal with page aligned file offsets.