Loading...
--- xnu/xnu-1504.9.26/iokit/Kernel/IOUserClient.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOUserClient.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -27,7 +27,6 @@
*/
-#include <libkern/c++/OSKext.h>
#include <IOKit/IOKitServer.h>
#include <IOKit/IOKitKeysPrivate.h>
#include <IOKit/IOUserClient.h>
@@ -35,9 +34,7 @@
#include <IOKit/IORegistryEntry.h>
#include <IOKit/IOCatalogue.h>
#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
#include <IOKit/IOLib.h>
-#include <libkern/OSDebug.h>
#include <sys/proc.h>
#include <IOKit/assert.h>
@@ -48,7 +45,7 @@
#define SCALAR64(x) ((io_user_scalar_t)((unsigned int)x))
#define SCALAR32(x) ((uint32_t )x)
#define ARG32(x) ((void *)SCALAR32(x))
-#define REF64(x) ((io_user_reference_t)((UInt64)(x)))
+#define REF64(x) ((io_user_reference_t)((natural_t)(x)))
#define REF32(x) ((int)(x))
enum
@@ -88,7 +85,6 @@
extern void iokit_retain_port( ipc_port_t port );
extern void iokit_release_port( ipc_port_t port );
-extern void iokit_release_port_send( ipc_port_t port );
extern kern_return_t iokit_switch_object_port( ipc_port_t port, io_object_t obj, ipc_kobject_type_t type );
@@ -214,7 +210,7 @@
machPort = (IOMachPort *) dict->getObject( (const OSSymbol *) obj );
if( machPort) {
- destroyed = (machPort->mscount <= *mscount);
+ destroyed = (machPort->mscount == *mscount);
if( destroyed)
dict->removeObject( (const OSSymbol *) obj );
else
@@ -426,7 +422,7 @@
virtual void free();
static bool _handler( void * target,
- void * ref, IOService * newService, IONotifier * notifier );
+ void * ref, IOService * newService );
virtual bool handler( void * ref, IOService * newService );
virtual OSObject * getNextObject();
@@ -440,7 +436,7 @@
mach_msg_header_t msgHdr;
mach_msg_body_t msgBody;
mach_msg_port_descriptor_t ports[1];
- OSNotificationHeader64 notifyHeader __attribute__ ((packed));
+ OSNotificationHeader64 notifyHeader;
};
PingMsg * pingMsg;
@@ -591,7 +587,7 @@
}
bool IOServiceUserNotification::_handler( void * target,
- void * ref, IOService * newService, IONotifier * notifier )
+ void * ref, IOService * newService )
{
return( ((IOServiceUserNotification *) target)->handler( ref, newService ));
}
@@ -625,13 +621,13 @@
else
pingMsg->msgHdr.msgh_local_port = NULL;
- kr = mach_msg_send_from_kernel_proper( &pingMsg->msgHdr,
+ 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_proper {%x}\n", __FILE__, kr );
+ IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
}
return( true );
@@ -758,7 +754,7 @@
else
{
data->messageArgument[0] |= (data->messageArgument[0] << 32);
- argSize = sizeof(uint32_t);
+ argSize = sizeof(messageArgument);
}
}
else
@@ -776,7 +772,7 @@
pingMsg->ports[0].name = providerPort;
thisPort = iokit_port_for_object( this, IKOT_IOKIT_OBJECT );
pingMsg->msgHdr.msgh_local_port = thisPort;
- kr = mach_msg_send_from_kernel_proper( &pingMsg->msgHdr,
+ kr = mach_msg_send_from_kernel( &pingMsg->msgHdr,
pingMsg->msgHdr.msgh_size);
if( thisPort)
iokit_release_port( thisPort );
@@ -784,7 +780,7 @@
iokit_release_port( providerPort );
if( KERN_SUCCESS != kr)
- IOLog("%s: mach_msg_send_from_kernel_proper {%x}\n", __FILE__, kr );
+ IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
return( kIOReturnSuccess );
}
@@ -811,10 +807,10 @@
mach_port_t wakePort,
void *callback, void *refcon)
{
- asyncRef[kIOAsyncReservedIndex] = ((uintptr_t) wakePort)
+ asyncRef[kIOAsyncReservedIndex] = ((natural_t) wakePort)
| (kIOUCAsync0Flags & asyncRef[kIOAsyncReservedIndex]);
- asyncRef[kIOAsyncCalloutFuncIndex] = (uintptr_t) callback;
- asyncRef[kIOAsyncCalloutRefconIndex] = (uintptr_t) refcon;
+ asyncRef[kIOAsyncCalloutFuncIndex] = (natural_t) callback;
+ asyncRef[kIOAsyncCalloutRefconIndex] = (natural_t) refcon;
}
void IOUserClient::setAsyncReference64(OSAsyncReference64 asyncRef,
@@ -827,7 +823,7 @@
asyncRef[kIOAsyncCalloutRefconIndex] = refcon;
}
-static OSDictionary * CopyConsoleUser(UInt32 uid)
+inline OSDictionary * CopyConsoleUser(UInt32 uid)
{
OSArray * array;
OSDictionary * user = 0;
@@ -851,23 +847,6 @@
return user;
}
-static bool IOUCIsBackgroundTask(task_t task, bool * isBg)
-{
- kern_return_t kr;
- task_category_policy_data_t info;
- mach_msg_type_number_t count = TASK_CATEGORY_POLICY_COUNT;
- boolean_t get_default = false;
-
- kr = task_policy_get(current_task(),
- TASK_CATEGORY_POLICY,
- (task_policy_t) &info,
- &count,
- &get_default);
-
- *isBg = ((KERN_SUCCESS == kr) && (info.role == TASK_THROTTLE_APPLICATION));
- return (kr);
-}
-
IOReturn IOUserClient::clientHasPrivilege( void * securityToken,
const char * privilegeName )
{
@@ -878,20 +857,7 @@
OSDictionary * user;
bool secureConsole;
-
- if (!strncmp(privilegeName, kIOClientPrivilegeForeground,
- sizeof(kIOClientPrivilegeForeground)))
- {
- bool isBg;
- kern_return_t kr = IOUCIsBackgroundTask(current_task(), &isBg);
-
- if (KERN_SUCCESS != kr)
- return (kr);
- return (isBg ? kIOReturnNotPrivileged : kIOReturnSuccess);
- }
-
- if ((secureConsole = !strncmp(privilegeName, kIOClientPrivilegeSecureConsoleProcess,
- sizeof(kIOClientPrivilegeSecureConsoleProcess))))
+ if ((secureConsole = !strcmp(privilegeName, kIOClientPrivilegeSecureConsoleProcess)))
task = (task_t)((IOUCProcessToken *)securityToken)->token;
else
task = (task_t)securityToken;
@@ -901,19 +867,16 @@
if (KERN_SUCCESS != kr)
{}
- else if (!strncmp(privilegeName, kIOClientPrivilegeAdministrator,
- sizeof(kIOClientPrivilegeAdministrator))) {
+ else if (!strcmp(privilegeName, kIOClientPrivilegeAdministrator)) {
if (0 != token.val[0])
kr = kIOReturnNotPrivileged;
- } else if (!strncmp(privilegeName, kIOClientPrivilegeLocalUser,
- sizeof(kIOClientPrivilegeLocalUser))) {
+ } else if (!strcmp(privilegeName, kIOClientPrivilegeLocalUser)) {
user = CopyConsoleUser(token.val[0]);
if ( user )
user->release();
else
kr = kIOReturnNotPrivileged;
- } else if (secureConsole || !strncmp(privilegeName, kIOClientPrivilegeConsoleUser,
- sizeof(kIOClientPrivilegeConsoleUser))) {
+ } else if (secureConsole || !strcmp(privilegeName, kIOClientPrivilegeConsoleUser)) {
user = CopyConsoleUser(token.val[0]);
if ( user ) {
if (user->getObject(gIOConsoleSessionOnConsoleKey) != kOSBooleanTrue)
@@ -1003,14 +966,6 @@
return( kIOReturnUnsupported);
}
-IOReturn IOUserClient::registerNotificationPort(
- mach_port_t port,
- UInt32 type,
- io_user_reference_t refCon)
-{
- return (registerNotificationPort(port, type, (UInt32) refCon));
-}
-
IOReturn IOUserClient::getNotificationSemaphore( UInt32 notification_type,
semaphore_t * semaphore )
{
@@ -1029,16 +984,29 @@
return( kIOReturnUnsupported);
}
-#if !__LP64__
IOMemoryMap * IOUserClient::mapClientMemory(
IOOptionBits type,
task_t task,
IOOptionBits mapFlags,
IOVirtualAddress atAddress )
{
- return (NULL);
-}
-#endif
+ IOReturn err;
+ IOOptionBits options = 0;
+ IOMemoryDescriptor * memory;
+ IOMemoryMap * map = 0;
+
+ err = clientMemoryForType( (UInt32) type, &options, &memory );
+
+ if( memory && (kIOReturnSuccess == err)) {
+
+ options = (options & ~kIOMapUserOptionsMask)
+ | (mapFlags & kIOMapUserOptionsMask);
+ map = memory->map( task, atAddress, options );
+ memory->release();
+ }
+
+ return( map );
+}
IOMemoryMap * IOUserClient::mapClientMemory64(
IOOptionBits type,
@@ -1124,25 +1092,6 @@
}
return trap;
-}
-
-IOReturn IOUserClient::releaseAsyncReference64(OSAsyncReference64 reference)
-{
- mach_port_t port;
- port = (mach_port_t) (reference[0] & ~kIOUCAsync0Flags);
-
- if (MACH_PORT_NULL != port)
- iokit_release_port_send(port);
-
- return (kIOReturnSuccess);
-}
-
-IOReturn IOUserClient::releaseNotificationPort(mach_port_t port)
-{
- if (MACH_PORT_NULL != port)
- iokit_release_port_send(port);
-
- return (kIOReturnSuccess);
}
IOReturn IOUserClient::sendAsyncResult(OSAsyncReference reference,
@@ -1182,7 +1131,8 @@
{
OSNotificationHeader64 notifyHdr;
IOAsyncCompletionContent asyncContent;
- io_user_reference_t args[kMaxAsyncArgs] __attribute__ ((packed));
+ uint32_t pad;
+ io_user_reference_t args[kMaxAsyncArgs];
} msg64;
} m;
};
@@ -1209,6 +1159,7 @@
sizeof(replyMsg.msgHdr) + sizeof(replyMsg.m.msg64)
- (kMaxAsyncArgs - numArgs) * sizeof(io_user_reference_t);
replyMsg.m.msg64.notifyHdr.size = sizeof(IOAsyncCompletionContent)
+ + sizeof(uint32_t)
+ numArgs * sizeof(io_user_reference_t);
replyMsg.m.msg64.notifyHdr.type = kIOAsyncCompletionNotificationType;
bcopy(reference, replyMsg.m.msg64.notifyHdr.reference, sizeof(OSAsyncReference64));
@@ -1238,10 +1189,10 @@
replyMsg.m.msg32.args[idx] = REF32(args[idx]);
}
- kr = mach_msg_send_from_kernel_proper( &replyMsg.msgHdr,
+ kr = mach_msg_send_from_kernel( &replyMsg.msgHdr,
replyMsg.msgHdr.msgh_size);
if( KERN_SUCCESS != kr)
- IOLog("%s: mach_msg_send_from_kernel_proper {%x}\n", __FILE__, kr );
+ IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
return kr;
}
@@ -1261,16 +1212,16 @@
io_name_t className )
{
const OSMetaClass* my_obj = NULL;
-
- if( !object)
- return( kIOReturnBadArgument );
+
+ if( !object)
+ return( kIOReturnBadArgument );
my_obj = object->getMetaClass();
if (!my_obj) {
return (kIOReturnNotFound);
}
- strlcpy( className, my_obj->getClassName(), sizeof(io_name_t));
+ strcpy( className, my_obj->getClassName());
return( kIOReturnSuccess );
}
@@ -1454,9 +1405,9 @@
kern_return_t *result,
boolean_t *matches )
{
- kern_return_t kr;
- vm_offset_t data;
- vm_map_offset_t map_data;
+ kern_return_t kr;
+ vm_offset_t data;
+ vm_map_offset_t map_data;
kr = vm_map_copyout( kernel_map, &map_data, (vm_map_copy_t) matching );
data = CAST_DOWN(vm_offset_t, map_data);
@@ -1577,9 +1528,10 @@
if( !userNotify)
continue;
- notify = IOService::addMatchingNotification( sym, dict,
+ notify = IOService::addNotification( sym, dict,
&userNotify->_handler, userNotify );
if( notify) {
+ dict = 0;
*notification = userNotify;
userNotify->setNotification( notify );
err = kIOReturnSuccess;
@@ -1697,7 +1649,6 @@
io_name_t notification_type,
io_string_t matching,
mach_port_t port,
- // for binary compatibility reasons, this must be natural_t for ILP32
natural_t ref,
io_object_t * notification )
{
@@ -1982,18 +1933,6 @@
return( kIOReturnNotFound );
}
-/* Routine io_registry_entry_get_registry_entry_id */
-kern_return_t is_io_registry_entry_get_registry_entry_id(
- io_object_t registry_entry,
- uint64_t *entry_id )
-{
- CHECK( IORegistryEntry, registry_entry, entry );
-
- *entry_id = entry->getRegistryEntryID();
-
- return (kIOReturnSuccess);
-}
-
// Create a vm_map_copy_t or kalloc'ed data for memory
// to be copied out. ipc will free after the copyout.
@@ -2266,15 +2205,11 @@
/* Routine io_service_get_state */
kern_return_t is_io_service_get_state(
io_object_t _service,
- uint64_t *state,
- uint32_t *busy_state,
- uint64_t *accumulated_busy_time )
+ uint64_t *state )
{
CHECK( IOService, _service, service );
- *state = service->getState();
- *busy_state = service->getBusyState();
- *accumulated_busy_time = service->getAccumulatedBusyTime();
+ *state = service->getState();
return( kIOReturnSuccess );
}
@@ -2284,15 +2219,9 @@
io_object_t _service,
mach_timespec_t wait_time )
{
- uint64_t timeoutNS;
-
CHECK( IOService, _service, service );
- timeoutNS = wait_time.tv_sec;
- timeoutNS *= kSecondScale;
- timeoutNS += wait_time.tv_nsec;
-
- return( service->waitQuiet(timeoutNS) );
+ return( service->waitQuiet( &wait_time ));
}
/* Routine io_service_request_probe */
@@ -2414,12 +2343,6 @@
break;
}
client->sharedInstance = (0 != client->getProperty(kIOUserClientSharedInstanceKey));
- OSString * creatorName = IOCopyLogNameForPID(proc_selfpid());
- if (creatorName)
- {
- client->setProperty(kIOUserClientCreatorKey, creatorName);
- creatorName->release();
- }
}
}
while (false);
@@ -2473,7 +2396,7 @@
CHECK( IOUserClient, connection, client );
return( client->registerNotificationPort( port, notification_type,
- (io_user_reference_t) reference ));
+ reference ));
}
/* Routine io_connect_set_notification_port */
@@ -2626,7 +2549,7 @@
name = IOMachPort::makeSendRightForTask( from_task, map, IKOT_IOKIT_OBJECT );
if (name)
{
- map->userClientUnmap();
+ map->unmap();
err = iokit_mod_send_right( from_task, name, -2 );
err = kIOReturnSuccess;
}
@@ -3219,7 +3142,7 @@
const io_user_scalar_t * input,
mach_msg_type_number_t inputCount,
io_struct_inband_t output,
- IOByteCount * outputCount )
+ mach_msg_type_number_t * outputCount )
{
IOMethod func;
IOReturn err;
@@ -3564,7 +3487,7 @@
io_struct_inband_t input,
mach_msg_type_number_t inputCount,
io_struct_inband_t output,
- IOByteCount * outputCount )
+ mach_msg_type_number_t * outputCount )
{
IOMethod func;
IOReturn err = kIOReturnBadArgument;
@@ -3713,7 +3636,7 @@
err = kIOReturnNoMemory;
continue;
} else
- strlcpy(matching, s->text(), sizeof(io_string_t));
+ strcpy( matching, s->text());
}
while( false);
@@ -3742,19 +3665,15 @@
if( master_port != master_device_port)
return kIOReturnNotPrivileged;
- if( (flag != kIOCatalogRemoveKernelLinker &&
- flag != kIOCatalogKextdActive &&
- flag != kIOCatalogKextdFinishedLaunching) &&
- ( !inData || !inDataCount) )
- {
+ // FIXME: This is a hack. Should have own function for removeKernelLinker()
+ if( (flag != kIOCatalogRemoveKernelLinker && flag != kIOCatalogKextdFinishedLaunching) && ( !inData || !inDataCount) )
return kIOReturnBadArgument;
- }
if (inData) {
vm_map_offset_t map_data;
kr = vm_map_copyout( kernel_map, &map_data, (vm_map_copy_t)inData);
- data = CAST_DOWN(vm_offset_t, map_data);
+ data = CAST_DOWN(vm_offset_t, map_data);
if( kr != KERN_SUCCESS)
return kr;
@@ -3821,26 +3740,18 @@
}
break;
- case kIOCatalogRemoveKernelLinker:
- kr = KERN_NOT_SUPPORTED;
- break;
-
- case kIOCatalogKextdActive:
-#if !NO_KEXTD
- OSKext::setKextdActive();
-
- /* Dump all nonloaded startup extensions; kextd will now send them
- * down on request.
- */
- OSKext::flushNonloadedKexts( /* flushPrelinkedKexts */ false);
-#endif
- kr = kIOReturnSuccess;
+ case kIOCatalogRemoveKernelLinker: {
+ if (gIOCatalogue->removeKernelLinker() != KERN_SUCCESS) {
+ kr = kIOReturnError;
+ } else {
+ kr = kIOReturnSuccess;
+ }
+ }
break;
case kIOCatalogKextdFinishedLaunching: {
#if !NO_KEXTD
static bool clearedBusy = false;
-
if (!clearedBusy) {
IOService * serviceRoot = IOService::getServiceRoot();
if (serviceRoot) {
@@ -3981,9 +3892,7 @@
return kIOReturnSuccess;
}
-/* Routine io_catalog_module_loaded.
- * Is invoked from IOKitLib's IOCatalogueModuleLoaded(). Doesn't seem to be used.
- */
+/* Routine io_catalog_module_loaded */
kern_return_t is_io_catalog_module_loaded(
mach_port_t master_port,
io_name_t name)
@@ -4053,7 +3962,6 @@
{
IOReturn err;
IOService * object;
- IOByteCount structureOutputSize;
if (dispatch)
{
@@ -4094,7 +4002,6 @@
return (err);
}
-
// pre-Leopard API's don't do ool structs
if (args->structureInputDescriptor || args->structureOutputDescriptor)
{
@@ -4102,23 +4009,12 @@
return (err);
}
- structureOutputSize = args->structureOutputSize;
-
if (args->asyncWakePort)
{
IOExternalAsyncMethod * method;
if( !(method = getAsyncTargetAndMethodForIndex(&object, selector)) )
return (kIOReturnUnsupported);
-
- if (kIOUCForegroundOnly & method->flags)
- {
- bool isBg;
- kern_return_t kr = IOUCIsBackgroundTask(current_task(), &isBg);
-
- if ((KERN_SUCCESS == kr) && isBg)
- return (kIOReturnNotPermitted);
- }
switch (method->flags & kIOUCTypeMask)
{
@@ -4163,21 +4059,12 @@
if( !(method = getTargetAndMethodForIndex(&object, selector)) )
return (kIOReturnUnsupported);
- if (kIOUCForegroundOnly & method->flags)
- {
- bool isBg;
- kern_return_t kr = IOUCIsBackgroundTask(current_task(), &isBg);
-
- if ((KERN_SUCCESS == kr) && isBg)
- return (kIOReturnNotPermitted);
- }
-
switch (method->flags & kIOUCTypeMask)
{
case kIOUCScalarIStructI:
err = shim_io_connect_method_scalarI_structureI( method, object,
args->scalarInput, args->scalarInputCount,
- (char *) args->structureInput, args->structureInputSize );
+ (char *)args->structureInput, args->structureInputSize );
break;
case kIOUCScalarIScalarO:
@@ -4189,14 +4076,14 @@
case kIOUCScalarIStructO:
err = shim_io_connect_method_scalarI_structureO( method, object,
args->scalarInput, args->scalarInputCount,
- (char *) args->structureOutput, &structureOutputSize );
+ (char *) args->structureOutput, &args->structureOutputSize );
break;
case kIOUCStructIStructO:
err = shim_io_connect_method_structureI_structureO( method, object,
- (char *) args->structureInput, args->structureInputSize,
- (char *) args->structureOutput, &structureOutputSize );
+ (char *)args->structureInput, args->structureInputSize,
+ (char *) args->structureOutput, &args->structureOutputSize );
break;
default:
@@ -4204,22 +4091,14 @@
break;
}
}
-
- args->structureOutputSize = structureOutputSize;
-
return (err);
}
}; /* extern "C" */
-#if __LP64__
-OSMetaClassDefineReservedUnused(IOUserClient, 0);
+OSMetaClassDefineReservedUsed(IOUserClient, 0);
OSMetaClassDefineReservedUnused(IOUserClient, 1);
-#else
-OSMetaClassDefineReservedUsed(IOUserClient, 0);
-OSMetaClassDefineReservedUsed(IOUserClient, 1);
-#endif
OSMetaClassDefineReservedUnused(IOUserClient, 2);
OSMetaClassDefineReservedUnused(IOUserClient, 3);
OSMetaClassDefineReservedUnused(IOUserClient, 4);