Loading...
--- xnu/xnu-344.26/iokit/Kernel/IOUserClient.cpp
+++ xnu/xnu-123.5/iokit/Kernel/IOUserClient.cpp
@@ -65,9 +65,6 @@
extern ipc_port_t master_device_port;
-extern void iokit_retain_port( ipc_port_t port );
-extern void iokit_release_port( ipc_port_t port );
-
#include <vm/vm_map.h>
} /* extern "C" */
@@ -83,12 +80,9 @@
public:
OSObject * object;
ipc_port_t port;
- UInt32 mscount;
static IOMachPort * portForObject( OSObject * obj,
ipc_kobject_type_t type );
- static bool noMoreSendersForObject( OSObject * obj,
- ipc_kobject_type_t type, mach_port_mscount_t * mscount );
static void releasePortForObject( OSObject * obj,
ipc_kobject_type_t type );
static OSDictionary * dictForType( ipc_kobject_type_t type );
@@ -142,11 +136,8 @@
continue;
if( (inst = (IOMachPort *)
- dict->getObject( (const OSSymbol *) obj ))) {
- inst->mscount++;
- inst->retain();
+ dict->getObject( (const OSSymbol *) obj )))
continue;
- }
inst = new IOMachPort;
if( inst && !inst->init()) {
@@ -158,7 +149,7 @@
if( inst->port) {
// retains obj
dict->setObject( (const OSSymbol *) obj, inst );
- inst->mscount++;
+ inst->release(); // one more to free port => release obj
} else {
inst->release();
@@ -170,34 +161,6 @@
IOUnlock( gIOObjectPortLock);
return( inst );
-}
-
-bool IOMachPort::noMoreSendersForObject( OSObject * obj,
- ipc_kobject_type_t type, mach_port_mscount_t * mscount )
-{
- OSDictionary * dict;
- IOMachPort * machPort;
- bool destroyed = true;
-
- IOTakeLock( gIOObjectPortLock);
-
- if( (dict = dictForType( type ))) {
- obj->retain();
-
- machPort = (IOMachPort *) dict->getObject( (const OSSymbol *) obj );
- if( machPort) {
- destroyed = (machPort->mscount == *mscount);
- if( destroyed)
- dict->removeObject( (const OSSymbol *) obj );
- else
- *mscount = machPort->mscount;
- }
- obj->release();
- }
-
- IOUnlock( gIOObjectPortLock);
-
- return( destroyed );
}
void IOMachPort::releasePortForObject( OSObject * obj,
@@ -259,31 +222,19 @@
iokit_port_for_object( io_object_t obj, ipc_kobject_type_t type )
{
IOMachPort * machPort;
- ipc_port_t port;
-
- if( (machPort = IOMachPort::portForObject( obj, type ))) {
-
- port = machPort->port;
- if( port)
- iokit_retain_port( port );
-
- machPort->release();
-
- } else
- port = NULL;
-
- return( port );
+
+ if( (machPort = IOMachPort::portForObject( obj, type )))
+ return( machPort->port );
+ else
+ return( 0 );
}
kern_return_t
iokit_client_died( io_object_t obj, ipc_port_t /* port */,
- ipc_kobject_type_t type, mach_port_mscount_t * mscount )
+ ipc_kobject_type_t type )
{
IOUserClient * client;
IOMemoryMap * map;
-
- if( !IOMachPort::noMoreSendersForObject( obj, type, mscount ))
- return( kIOReturnNotReady );
if( (IKOT_IOKIT_CONNECT == type)
&& (client = OSDynamicCast( IOUserClient, obj )))
@@ -292,7 +243,9 @@
&& (map = OSDynamicCast( IOMemoryMap, obj )))
map->taskDied();
- return( kIOReturnSuccess );
+ IOMachPort::releasePortForObject( obj, type );
+
+ return( kIOReturnSuccess);
}
}; /* extern "C" */
@@ -398,7 +351,7 @@
pingMsg->msgHdr.msgh_remote_port = port;
pingMsg->msgHdr.msgh_bits = MACH_MSGH_BITS(
MACH_MSG_TYPE_COPY_SEND,
- MACH_MSG_TYPE_MAKE_SEND );
+ MACH_MSG_TYPE_COPY_SEND );
pingMsg->msgHdr.msgh_size = msgSize;
pingMsg->msgHdr.msgh_id = kOSNotificationMessageID;
@@ -483,7 +436,7 @@
{
unsigned int count;
kern_return_t kr;
- ipc_port_t port = NULL;
+ IOMachPort * machPort;
bool sendPing = false;
IOTakeLock( lock );
@@ -499,16 +452,12 @@
IOUnlock( lock );
if( sendPing) {
- if( (port = iokit_port_for_object( this, IKOT_IOKIT_OBJECT ) ))
- pingMsg->msgHdr.msgh_local_port = port;
- else
- pingMsg->msgHdr.msgh_local_port = NULL;
+ if( (0 == pingMsg->msgHdr.msgh_local_port)
+ && (machPort = IOMachPort::portForObject( this, IKOT_IOKIT_OBJECT ) ))
+ pingMsg->msgHdr.msgh_local_port = machPort->port;
kr = mach_msg_send_from_kernel( &pingMsg->msgHdr,
pingMsg->msgHdr.msgh_size);
- if( port)
- iokit_release_port( port );
-
if( KERN_SUCCESS != kr)
IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
}
@@ -573,7 +522,7 @@
void * messageArgument, vm_size_t argSize )
{
kern_return_t kr;
- ipc_port_t port;
+ IOMachPort * machPort;
IOServiceInterestContent * data = (IOServiceInterestContent *)
pingMsg->notifyHeader.content;
@@ -591,17 +540,13 @@
- sizeof( data->messageArgument)
+ argSize;
- if( (port = iokit_port_for_object( provider, IKOT_IOKIT_OBJECT ) ))
- pingMsg->msgHdr.msgh_local_port = port;
+ if( (machPort = IOMachPort::portForObject( provider, IKOT_IOKIT_OBJECT ) ))
+ pingMsg->msgHdr.msgh_local_port = machPort->port;
else
- pingMsg->msgHdr.msgh_local_port = NULL;
+ pingMsg->msgHdr.msgh_local_port = MACH_PORT_NULL;
kr = mach_msg_send_from_kernel( &pingMsg->msgHdr,
pingMsg->msgHdr.msgh_size);
-
- if( port)
- iokit_release_port( port );
-
if( KERN_SUCCESS != kr)
IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
@@ -730,8 +675,8 @@
IOMemoryMap * IOUserClient::mapClientMemory(
IOOptionBits type,
task_t task,
- IOOptionBits mapFlags,
- IOVirtualAddress atAddress )
+ IOOptionBits mapFlags = kIOMapAnywhere,
+ IOVirtualAddress atAddress = 0 )
{
IOReturn err;
IOOptionBits options = 0;
@@ -857,6 +802,47 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+#include <IOKit/pci/IOPCIDevice.h>
+
+static void makeMatchingCompatible( OSDictionary * dict )
+{
+ const char * key;
+ const char * newKey;
+ OSObject * value;
+ OSString * str;
+ int i = 0;
+
+ static const char * gratuitousNameChanges[] = {
+ "IOImports", kIOProviderClassKey,
+ "IOClass Names", kIOClassKey,
+ "IOProbe Score", kIOProbeScoreKey,
+ "IOKit Debug", kIOKitDebugKey,
+ "IONeededResources", kIOResourceMatchKey,
+ "IOName Match", kIONameMatchKey,
+ "IOPCI Match", kIOPCIMatchKey,
+ "IOPCI Primary Match", kIOPCIPrimaryMatchKey,
+ "IOPCI Secondary Match",kIOPCISecondaryMatchKey,
+ "IOPCI Class Match", kIOPCIClassMatchKey,
+ 0
+ };
+
+ while( (key = gratuitousNameChanges[i++])) {
+ newKey = gratuitousNameChanges[i++];
+ if( (value = dict->getObject( key))
+ && (0 == dict->getObject( newKey))) {
+
+ dict->setObject( newKey, value);
+ dict->removeObject( key);
+
+ if( (str = OSDynamicCast(OSString, dict->getObject("CFBundleIdentifier"))))
+ IOLog("kext \"%s\" ", str->getCStringNoCopy());
+ IOLog("must change \"%s\" to \"%s\"\n", key, newKey);
+ }
+ }
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
extern "C" {
#define CHECK(cls,obj,out) \
@@ -984,6 +970,7 @@
obj = OSUnserializeXML( matching );
if( (dict = OSDynamicCast( OSDictionary, obj))) {
+ makeMatchingCompatible( dict ); // temp for binary compatibility
*existing = IOService::getMatchingServices( dict );
kr = kIOReturnSuccess;
} else
@@ -1028,6 +1015,7 @@
err = kIOReturnBadArgument;
continue;
}
+ makeMatchingCompatible( dict ); // temp for binary compatibility
if( (sym == gIOPublishNotification)
|| (sym == gIOFirstPublishNotification))
@@ -1289,43 +1277,15 @@
/* Routine io_registry_entry_get_name_in_plane */
kern_return_t is_io_registry_entry_get_name_in_plane(
io_object_t registry_entry,
- io_name_t planeName,
+ io_name_t plane,
io_name_t name )
{
- const IORegistryPlane * plane;
CHECK( IORegistryEntry, registry_entry, entry );
- if( planeName[0])
- plane = IORegistryEntry::getPlane( planeName );
- else
- plane = 0;
-
- strncpy( name, entry->getName( plane), sizeof( io_name_t));
+ strncpy( name, entry->getName( IORegistryEntry::getPlane( plane )),
+ sizeof( io_name_t));
return( kIOReturnSuccess );
-}
-
-/* Routine io_registry_entry_get_location_in_plane */
-kern_return_t is_io_registry_entry_get_location_in_plane(
- io_object_t registry_entry,
- io_name_t planeName,
- io_name_t location )
-{
- const IORegistryPlane * plane;
- CHECK( IORegistryEntry, registry_entry, entry );
-
- if( planeName[0])
- plane = IORegistryEntry::getPlane( planeName );
- else
- plane = 0;
-
- const char * cstr = entry->getLocation( plane );
-
- if( cstr) {
- strncpy( location, cstr, sizeof( io_name_t));
- return( kIOReturnSuccess );
- } else
- return( kIOReturnNotFound );
}
// Create a vm_map_copy_t or kalloc'ed data for memory
@@ -1337,18 +1297,85 @@
kern_return_t err;
vm_map_copy_t copy;
- err = vm_map_copyin( kernel_map, (vm_offset_t) data, len,
- false /* src_destroy */, ©);
-
- assert( err == KERN_SUCCESS );
- if( err == KERN_SUCCESS )
- *buf = (char *) copy;
-
+ err = vm_map_copyin( kernel_map, (vm_offset_t) data, len,
+ false /* src_destroy */, ©);
+
+ assert( err == KERN_SUCCESS );
+ if( err == KERN_SUCCESS )
+ *buf = (char *) copy;
return( err );
}
+
+/* Routine io_registry_entry_get_properties */
+kern_return_t is_io_registry_entry_get_properties(
+ io_object_t registry_entry,
+ io_buf_ptr_t *properties,
+ mach_msg_type_number_t *propertiesCnt )
+{
+ kern_return_t err;
+ vm_size_t len;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+ OSSerialize * s = OSSerialize::withCapacity(4096);
+
+ if( !s)
+ return( kIOReturnNoMemory );
+
+ s->clearText();
+
+ if( entry->serializeProperties( s )) {
+ len = s->getLength();
+ *propertiesCnt = len;
+ err = copyoutkdata( s->text(), len, properties );
+
+ } else
+ err = kIOReturnUnsupported;
+
+ s->release();
+
+ return( err );
+}
+
+/* Routine io_registry_entry_set_properties */
+kern_return_t is_io_registry_entry_set_properties
+(
+ io_object_t registry_entry,
+ io_buf_ptr_t properties,
+ mach_msg_type_number_t propertiesCnt,
+ natural_t * result)
+{
+ OSObject * obj;
+ kern_return_t err;
+ IOReturn res;
+ vm_offset_t data;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+ err = vm_map_copyout( kernel_map, &data, (vm_map_copy_t) properties );
+
+ if( KERN_SUCCESS == err) {
+
+ // must return success after vm_map_copyout() succeeds
+ obj = OSUnserializeXML( (const char *) data );
+ vm_deallocate( kernel_map, data, propertiesCnt );
+
+ if( obj) {
+ res = entry->setProperties( obj );
+ obj->release();
+ } else
+ res = kIOReturnBadArgument;
+ } else
+ res = err;
+
+ *result = res;
+ return( err );
+}
+
+
/* Routine io_registry_entry_get_property */
-kern_return_t is_io_registry_entry_get_property_bytes(
+kern_return_t is_io_registry_entry_get_property(
io_object_t registry_entry,
io_name_t property_name,
io_scalar_inband_t buf,
@@ -1366,7 +1393,7 @@
CHECK( IORegistryEntry, registry_entry, entry );
- obj = entry->copyProperty(property_name);
+ obj = entry->getProperty( property_name );
if( !obj)
return( kIOReturnNoResources );
@@ -1404,155 +1431,10 @@
bcopy( bytes, buf, len );
}
}
- obj->release();
return( ret );
}
-/* Routine io_registry_entry_get_property */
-kern_return_t is_io_registry_entry_get_property(
- io_object_t registry_entry,
- io_name_t property_name,
- io_buf_ptr_t *properties,
- mach_msg_type_number_t *propertiesCnt )
-{
- kern_return_t err;
- vm_size_t len;
- OSObject * obj;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- obj = entry->copyProperty(property_name);
- if( !obj)
- return( kIOReturnNotFound );
-
- OSSerialize * s = OSSerialize::withCapacity(4096);
- if( !s) {
- obj->release();
- return( kIOReturnNoMemory );
- }
- s->clearText();
-
- if( obj->serialize( s )) {
- len = s->getLength();
- *propertiesCnt = len;
- err = copyoutkdata( s->text(), len, properties );
-
- } else
- err = kIOReturnUnsupported;
-
- s->release();
- obj->release();
-
- return( err );
-}
-
-/* Routine io_registry_entry_get_property_recursively */
-kern_return_t is_io_registry_entry_get_property_recursively(
- io_object_t registry_entry,
- io_name_t plane,
- io_name_t property_name,
- int options,
- io_buf_ptr_t *properties,
- mach_msg_type_number_t *propertiesCnt )
-{
- kern_return_t err;
- vm_size_t len;
- OSObject * obj;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- obj = entry->copyProperty( property_name,
- IORegistryEntry::getPlane( plane ), options);
- if( !obj)
- return( kIOReturnNotFound );
-
- OSSerialize * s = OSSerialize::withCapacity(4096);
- if( !s) {
- obj->release();
- return( kIOReturnNoMemory );
- }
-
- s->clearText();
-
- if( obj->serialize( s )) {
- len = s->getLength();
- *propertiesCnt = len;
- err = copyoutkdata( s->text(), len, properties );
-
- } else
- err = kIOReturnUnsupported;
-
- s->release();
- obj->release();
-
- return( err );
-}
-
-/* Routine io_registry_entry_get_properties */
-kern_return_t is_io_registry_entry_get_properties(
- io_object_t registry_entry,
- io_buf_ptr_t *properties,
- mach_msg_type_number_t *propertiesCnt )
-{
- kern_return_t err;
- vm_size_t len;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- OSSerialize * s = OSSerialize::withCapacity(4096);
- if( !s)
- return( kIOReturnNoMemory );
-
- s->clearText();
-
- if( entry->serializeProperties( s )) {
- len = s->getLength();
- *propertiesCnt = len;
- err = copyoutkdata( s->text(), len, properties );
-
- } else
- err = kIOReturnUnsupported;
-
- s->release();
-
- return( err );
-}
-
-/* Routine io_registry_entry_set_properties */
-kern_return_t is_io_registry_entry_set_properties
-(
- io_object_t registry_entry,
- io_buf_ptr_t properties,
- mach_msg_type_number_t propertiesCnt,
- natural_t * result)
-{
- OSObject * obj;
- kern_return_t err;
- IOReturn res;
- vm_offset_t data;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- err = vm_map_copyout( kernel_map, &data, (vm_map_copy_t) properties );
-
- if( KERN_SUCCESS == err) {
-
- // must return success after vm_map_copyout() succeeds
- obj = OSUnserializeXML( (const char *) data );
- vm_deallocate( kernel_map, data, propertiesCnt );
-
- if( obj) {
- res = entry->setProperties( obj );
- obj->release();
- } else
- res = kIOReturnBadArgument;
- } else
- res = err;
-
- *result = res;
- return( err );
-}
/* Routine io_registry_entry_get_child_iterator */
kern_return_t is_io_registry_entry_get_child_iterator(
@@ -1751,8 +1633,8 @@
IOLockLock( gIOObjectPortLock);
if( client->mappings)
client->mappings->removeObject( map);
+ IOMachPort::releasePortForObject( map, IKOT_IOKIT_OBJECT );
IOLockUnlock( gIOObjectPortLock);
- IOMachPort::releasePortForObject( map, IKOT_IOKIT_OBJECT );
map->release();
} else
err = kIOReturnBadArgument;
@@ -2455,6 +2337,12 @@
array = OSDynamicCast(OSArray, obj);
if ( array ) {
+//--
+ OSDictionary * dict;
+ int i = 0;
+ while( (dict = OSDynamicCast(OSDictionary, array->getObject(i++))))
+ makeMatchingCompatible( dict );
+//--
if ( !gIOCatalogue->addDrivers( array ,
flag == kIOCatalogAddDrivers) ) {
kr = kIOReturnError;
@@ -2472,6 +2360,7 @@
dict = OSDynamicCast(OSDictionary, obj);
if ( dict ) {
+ makeMatchingCompatible( dict );
if ( !gIOCatalogue->removeDrivers( dict,
flag == kIOCatalogRemoveDrivers ) ) {
kr = kIOReturnError;
@@ -2488,6 +2377,7 @@
dict = OSDynamicCast(OSDictionary, obj);
if ( dict ) {
+ makeMatchingCompatible( dict );
if ( !gIOCatalogue->startMatching( dict ) ) {
kr = kIOReturnError;
}
@@ -2501,8 +2391,6 @@
case kIOCatalogRemoveKernelLinker: {
if (gIOCatalogue->removeKernelLinker() != KERN_SUCCESS) {
kr = kIOReturnError;
- } else {
- kr = kIOReturnSuccess;
}
}
break;
@@ -2680,34 +2568,31 @@
return kIOReturnSuccess;
}
-kern_return_t iokit_user_client_trap(io_object_t userClientRef, UInt32 index,
- void *p1, void *p2, void *p3,
- void *p4, void *p5, void *p6)
-{
- kern_return_t result = kIOReturnBadArgument;
- IOUserClient *userClient;
-
- if ((userClient = OSDynamicCast(IOUserClient,
- iokit_lookup_connect_ref_current_task(userClientRef)))) {
- IOExternalTrap *trap;
- IOService *target = NULL;
-
- trap = userClient->getTargetAndTrapForIndex(&target, index);
-
- if (trap && target) {
- IOTrap func;
-
- func = trap->func;
-
- if (func) {
- result = (target->*func)(p1, p2, p3, p4, p5, p6);
- }
- }
-
- userClient->release();
- }
-
- return result;
+kern_return_t iokit_user_client_trap(io_object_t userClientRef, UInt32 index, void *p1, void *p2, void *p3, void *p4, void *p5, void *p6)
+{
+ kern_return_t result = kIOReturnBadArgument;
+ IOUserClient *userClient;
+
+ if ((userClient = OSDynamicCast(IOUserClient, iokit_lookup_connect_ref_current_task(userClientRef)))) {
+ IOExternalTrap *trap;
+ IOService *target = NULL;
+
+ trap = userClient->getTargetAndTrapForIndex(&target, index);
+
+ if (trap && target) {
+ IOTrap func;
+
+ func = trap->func;
+
+ if (func) {
+ result = (target->*func)(p1, p2, p3, p4, p5, p6);
+ }
+ }
+
+ userClient->release();
+ }
+
+ return result;
}
}; /* extern "C" */