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

* Locking order dictates that this lock is an inner lock, and shouldn't

Browse Source 
be used everywhere.
* This also fixes a panic when deleting interfaces (an already deleted
  lock was unlocked).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29902 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-04 16:23:42 +00:00
parent d7553dfed0
commit bda94e2e25
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/domains.cpp
+1 -5
View File
@@ -220,11 +220,7 @@ domain_interface_control(net_domain_private* domain, int32 option,
if (device == NULL) if (device == NULL)
return ENODEV; return ENODEV;
// The locking protocol dictates that if both the receive lock RecursiveLocker _(domain->lock);
// and domain locks are required, we MUST obtain the receive
// lock before the domain lock.
RecursiveLocker _1(device->receive_lock);
RecursiveLocker _2(domain->lock);
net_interface* interface = find_interface(domain, name); net_interface* interface = find_interface(domain, name);
if (interface != NULL) { if (interface != NULL) {
src/add-ons/kernel/network/stack/interfaces.cpp
+2 -12
View File
@@ -169,6 +169,8 @@ acquire_device_interface(net_device_interface* interface)
static void static void
notify_device_monitors(net_device_interface* interface, int32 event) notify_device_monitors(net_device_interface* interface, int32 event)
{ {
RecursiveLocker _(interface->receive_lock);
DeviceMonitorList::Iterator iterator DeviceMonitorList::Iterator iterator
= interface->monitor_funcs.GetIterator(); = interface->monitor_funcs.GetIterator();
while (net_device_monitor* monitor = iterator.Next()) { while (net_device_monitor* monitor = iterator.Next()) {
@@ -545,15 +547,9 @@ down_device_interface(net_device_interface* interface)
if (device->module->receive_data != NULL) { if (device->module->receive_data != NULL) {
thread_id readerThread = interface->reader_thread; thread_id readerThread = interface->reader_thread;
// one of the callers must hold a reference to the net_device_interface
// usually it is one of the net_interfaces.
recursive_lock_unlock(&interface->receive_lock);
// make sure the reader thread is gone before shutting down the interface // make sure the reader thread is gone before shutting down the interface
status_t status; status_t status;
wait_for_thread(readerThread, &status); wait_for_thread(readerThread, &status);
recursive_lock_lock(&interface->receive_lock);
} }
} }
@@ -768,12 +764,6 @@ device_removed(net_device* device)
// This is very complex, refer to delete_interface() for // This is very complex, refer to delete_interface() for
// further details. // further details.
RecursiveLocker _(interface->receive_lock);
// this will possibly call:
// remove_interface_from_domain() [domain gets locked]
// delete_interface()
// ... [see delete_interface()]
domain_removed_device_interface(interface); domain_removed_device_interface(interface);
notify_device_monitors(interface, B_DEVICE_BEING_REMOVED); notify_device_monitors(interface, B_DEVICE_BEING_REMOVED);