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

kernel/legacy_drivers: check priority when finding a driver with the same leaf name

Browse Source 
* fix get_priority(): only compares the path length, not the buffer length.
* fix #17264 second part (don't replace the user driver with the system one)

Change-Id: I199ba5751884a4f2ec86f6d9fb81cd560fe164a8
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8500
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2024-10-22 18:42:05 +00:00
parent 1b05bf1a7e
commit 53cab618ef
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/legacy_drivers.cpp
+6 -7
View File
@@ -529,12 +529,11 @@ get_priority(const char* path)
}; };
KPath pathBuffer; KPath pathBuffer;
for (uint32 index = 0; index < sizeof(whichPath) / sizeof(whichPath[0]); for (uint32 index = 0; index < B_COUNT_OF(whichPath); index++) {
index++) {
if (__find_directory(whichPath[index], gBootDevice, false, if (__find_directory(whichPath[index], gBootDevice, false,
pathBuffer.LockBuffer(), pathBuffer.BufferSize()) == B_OK) { pathBuffer.LockBuffer(), pathBuffer.BufferSize()) == B_OK) {
pathBuffer.UnlockBuffer(); pathBuffer.UnlockBuffer();
if (!strncmp(pathBuffer.Path(), path, pathBuffer.BufferSize())) if (strncmp(pathBuffer.Path(), path, pathBuffer.Length()) == 0)
return index; return index;
} else } else
pathBuffer.UnlockBuffer(); pathBuffer.UnlockBuffer();
@@ -593,7 +592,7 @@ add_driver(const char* path, image_id image)
legacy_driver* driver = sDriverHash->Lookup(get_leaf(path)); legacy_driver* driver = sDriverHash->Lookup(get_leaf(path));
if (driver != NULL) { if (driver != NULL) {
// we know this driver // we know this driver
if (strcmp(driver->path, path) != 0) { if (strcmp(driver->path, path) != 0 && priority >= driver->priority) {
// TODO: do properly, but for now we just update the path if it // TODO: do properly, but for now we just update the path if it
// isn't the same anymore so rescanning of drivers will work in // isn't the same anymore so rescanning of drivers will work in
// case this driver was loaded so early that it has a boot module // case this driver was loaded so early that it has a boot module
@@ -604,7 +603,7 @@ add_driver(const char* path, image_id image)
driver->binary_updated = true; driver->binary_updated = true;
} }
// TODO: check if this driver is a different one and has precendence // TODO: check if this driver is a different one and has precedence
// (ie. common supersedes system). // (ie. common supersedes system).
//dprintf("new driver has priority %ld, old %ld\n", priority, driver->priority); //dprintf("new driver has priority %ld, old %ld\n", priority, driver->priority);
if (priority >= driver->priority) { if (priority >= driver->priority) {
@@ -749,14 +748,14 @@ handle_driver_events(void* /*_fs*/, int /*iteration*/)
} }
case kAddWatcher: case kAddWatcher:
TRACE((" add watcher %ld:%lld\n", event->node.device, TRACE((" add watcher %" B_PRId32 ":%" B_PRIdINO "\n", event->node.device,
event->node.node)); event->node.node));
add_node_listener(event->node.device, event->node.node, add_node_listener(event->node.device, event->node.node,
B_WATCH_STAT | B_WATCH_NAME, sDriverWatcher); B_WATCH_STAT | B_WATCH_NAME, sDriverWatcher);
break; break;
case kRemoveWatcher: case kRemoveWatcher:
TRACE((" remove watcher %ld:%lld\n", event->node.device, TRACE((" remove watcher %" B_PRId32 ":%" B_PRIdINO "\n", event->node.device,
event->node.node)); event->node.node));
remove_node_listener(event->node.device, event->node.node, remove_node_listener(event->node.device, event->node.node,
sDriverWatcher); sDriverWatcher);