From dedf24f75771e6fa038d3f6e1c47f54cd30597c2 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 3 Mar 2019 17:20:53 -0500 Subject: [PATCH] kernel: Don't load modules from non-packaged under "disable user add-ons". This matches the behavior of the "new-style" module system. Part of #14361. --- src/system/kernel/device_manager/legacy_drivers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/device_manager/legacy_drivers.cpp b/src/system/kernel/device_manager/legacy_drivers.cpp index 8649ac80d2..e0b169d57c 100644 --- a/src/system/kernel/device_manager/legacy_drivers.cpp +++ b/src/system/kernel/device_manager/legacy_drivers.cpp @@ -945,7 +945,7 @@ DirectoryIterator::SetTo(const char* path, const char* subPath, bool recursive) B_SAFEMODE_DISABLE_USER_ADD_ONS, false); for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) { - if (i < 2 && disableUserAddOns) + if (i < 3 && disableUserAddOns) continue; if (__find_directory(kDriverPaths[i], gBootDevice, true, @@ -1480,7 +1480,7 @@ legacy_driver_probe(const char* subPath) B_SAFEMODE_DISABLE_USER_ADD_ONS, false); for (uint32 i = 0; i < sizeof(kDriverPaths) / sizeof(kDriverPaths[0]); i++) { - if (i < 2 && disableUserAddOns) + if (i < 3 && disableUserAddOns) continue; if (__find_directory(kDriverPaths[i], gBootDevice, true,