Loading...
--- xnu/xnu-517.7.21/libsa/kext.cpp
+++ xnu/xnu-792.1.5/libsa/kext.cpp
@@ -335,9 +335,11 @@
static bool
figureDependenciesForKext(OSDictionary * kextPlist,
OSDictionary * dependencies,
- OSString * trueParent)
+ OSString * trueParent,
+ Boolean skipKernelDependencies)
{
bool result = true;
+ bool hasDirectKernelDependency = false;
OSString * kextName = 0; // don't release
OSDictionary * libraries = 0; // don't release
OSCollectionIterator * keyIterator = 0; // must release
@@ -379,9 +381,26 @@
result = false;
goto finish;
} else {
- dependencies->setObject(libraryName,
+ char is_kernel_component;
+
+ if (!kextIsDependency(libraryName->getCStringNoCopy(), &is_kernel_component))
+ is_kernel_component = false;
+
+ if (!skipKernelDependencies || !is_kernel_component) {
+ dependencies->setObject(libraryName,
+ trueParent ? trueParent : kextName);
+ }
+ if (!hasDirectKernelDependency && is_kernel_component) {
+ hasDirectKernelDependency = true;
+ }
+ }
+ }
+ if (!hasDirectKernelDependency) {
+ /* a kext without any kernel dependency is assumed dependent on 6.0 */
+ dependencies->setObject("com.apple.kernel.libkern",
trueParent ? trueParent : kextName);
- }
+ IOLog("Extension \"%s\" has no kernel dependency.\n",
+ kextName->getCStringNoCopy());
}
finish:
@@ -504,7 +523,7 @@
goto finish;
}
- if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL)) {
+ if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL, false)) {
IOLog("can't determine immediate dependencies for extension %s\n",
kmod_name);
result = false;
@@ -570,7 +589,7 @@
* binaryless, dependency.
*/
if (!figureDependenciesForKext(kextPlist, pendingDependencies,
- dependentName)) {
+ dependentName, true)) {
IOLog("can't determine immediate dependencies for extension %s\n",
library_name);
@@ -634,7 +653,7 @@
/* Now put the library's dependencies onto the pending set.
*/
if (!figureDependenciesForKext(kextPlist, pendingDependencies,
- NULL)) {
+ NULL, false)) {
IOLog("can't determine immediate dependencies for extension %s\n",
library_name);