Ticket #2185: module.cpp.diff

src/system/kernel/module.cpp

@@ -958 +958 @@
                     image->name)) != NULL) {
             // even if strlcpy() is used here, it's by no means safe
             // against buffer overflows
-            size_t length = strlcpy(path, "/boot/beos/system/add-ons/kernel/",
-                sizeof(path));
-            strlcpy(path + length, name, strlen(image->name)
-                + 1 + (suffix - name));
+            KPath addonsKernelPath;
+            status_t status = find_directory(B_BEOS_ADDONS_DIRECTORY, gBootDevice,
+                false, addonsKernelPath.LockBuffer(), addonsKernelPath.BufferSize());
+            if (status < B_OK) {
+                dprintf("register_preloaded_module_image: Failed when find_directory \"%s\"\n",
+                    strerror(status));
+            } else {
+                addonsKernelPath.UnlockBuffer();
+                addonsKernelPath.Append("kernel/");
+                size_t length = strlcpy(path, addonsKernelPath.Path(), sizeof(path));
+                strlcpy(path + length, name, strlen(image->name)
+                    + 1 + (suffix - name));
 
-            moduleImage->path = strdup(path);
+                moduleImage->path = strdup(path);
+            }
         } else
             moduleImage->path = strdup(image->name);
     }