i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The delete_area() call in the kernel now only allows to delete areas created

Browse Source 
in the kernel.
Use the new delete_area_etc() call for other needs.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4321 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-08-19 17:21:50 +00:00
parent b2e5e9af2d
commit 5152eb6890
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/vm/vm.c
+12 -9
View File
@@ -904,15 +904,12 @@ region_id vm_clone_region(aspace_id aid, char *name, void **address, int addr_ty
static int static int
__vm_delete_region(vm_address_space *aspace, vm_region *region) __vm_delete_region(vm_address_space *aspace, vm_region *region)
{ {
// ToDo: allowing a NULL aspace parameter reduces security // ToDo: I am really not sure if it's a good idea not to
// but is needed for BeOS compatibility - we should consider
// introducing team privileges for those things, though.
// Also, I am really not sure if it's a good idea not to
// wait until the area has really been freed - code following // wait until the area has really been freed - code following
// might rely on the address space to available again, and // might rely on the address space to available again, and
// there is no other way to wait for the completion of the // there is no other way to wait for the completion of the
// deletion. // deletion.
if (aspace == NULL || region->aspace == aspace) if (region->aspace == aspace)
vm_put_region(region); vm_put_region(region);
return B_NO_ERROR; return B_NO_ERROR;
@@ -922,10 +919,9 @@ __vm_delete_region(vm_address_space *aspace, vm_region *region)
static int static int
_vm_delete_region(vm_address_space *aspace, region_id rid) _vm_delete_region(vm_address_space *aspace, region_id rid)
{ {
// vm_region *temp, *last = NULL;
vm_region *region; vm_region *region;
dprintf("vm_delete_region: aspace id 0x%lx, region id 0x%lx\n", aspace ? aspace->id : -1, rid); dprintf("vm_delete_region: aspace id 0x%lx, region id 0x%lx\n", aspace->id, rid);
region = vm_get_region_by_id(rid); region = vm_get_region_by_id(rid);
if (region == NULL) if (region == NULL)
@@ -945,7 +941,7 @@ vm_delete_region(aspace_id aid, region_id rid)
int err; int err;
aspace = vm_get_aspace_by_id(aid); aspace = vm_get_aspace_by_id(aid);
if(aspace == NULL) if (aspace == NULL)
return ERR_VM_INVALID_ASPACE; return ERR_VM_INVALID_ASPACE;
err = _vm_delete_region(aspace, rid); err = _vm_delete_region(aspace, rid);
@@ -2358,10 +2354,17 @@ create_area(const char *name, void **address, uint32 addressSpec, size_t size, u
} }
status_t
delete_area_etc(struct team *team, area_id area)
{
return vm_delete_region(team->_aspace_id, area);
}
status_t status_t
delete_area(area_id area) delete_area(area_id area)
{ {
return vm_delete_region(NULL, area); return vm_delete_region(vm_get_kernel_aspace_id(), area);
} }