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

unlock_memory_etc(): Fix address space reference leak

Browse Source 
unlock_memory_etc() is supposed to release the address space reference
lock_memory_etc() acquired. It didn't do that, though.
This commit is contained in:
Ingo Weinhold
2013-11-13 01:47:36 +01:00
parent 93fb0ff056
commit 2b269f2e47
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+6 -2
View File
@@ -5352,6 +5352,8 @@ lock_memory_etc(team_id team, void* address, size_t numBytes, uint32 flags)
return B_ERROR; return B_ERROR;
AddressSpaceReadLocker addressSpaceLocker(addressSpace, true); AddressSpaceReadLocker addressSpaceLocker(addressSpace, true);
// We get a new address space reference here. The one we got above will
// be freed by unlock_memory_etc().
VMTranslationMap* map = addressSpace->TranslationMap(); VMTranslationMap* map = addressSpace->TranslationMap();
status_t error = B_OK; status_t error = B_OK;
@@ -5508,7 +5510,9 @@ unlock_memory_etc(team_id team, void* address, size_t numBytes, uint32 flags)
if (addressSpace == NULL) if (addressSpace == NULL)
return B_ERROR; return B_ERROR;
AddressSpaceReadLocker addressSpaceLocker(addressSpace, true); AddressSpaceReadLocker addressSpaceLocker(addressSpace, false);
// Take over the address space reference. We don't unlock until we're
// done.
VMTranslationMap* map = addressSpace->TranslationMap(); VMTranslationMap* map = addressSpace->TranslationMap();
status_t error = B_OK; status_t error = B_OK;
@@ -5594,7 +5598,7 @@ unlock_memory_etc(team_id team, void* address, size_t numBytes, uint32 flags)
break; break;
} }
// get rid of the address space reference // get rid of the address space reference lock_memory_etc() acquired
addressSpace->Put(); addressSpace->Put();
return error; return error;