Loading...
--- xnu/xnu-2422.90.20/iokit/Kernel/IOUserClient.cpp
+++ xnu/xnu-792/iokit/Kernel/IOUserClient.cpp
@@ -1,102 +1,38 @@
/*
- * Copyright (c) 1998-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
-#include <libkern/c++/OSKext.h>
#include <IOKit/IOKitServer.h>
-#include <IOKit/IOKitKeysPrivate.h>
#include <IOKit/IOUserClient.h>
+#include <IOKit/IOService.h>
#include <IOKit/IOService.h>
#include <IOKit/IORegistryEntry.h>
#include <IOKit/IOCatalogue.h>
#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
#include <IOKit/IOLib.h>
-#include <IOKit/IOStatisticsPrivate.h>
-#include <IOKit/IOTimeStamp.h>
-#include <IOKit/system.h>
-#include <libkern/OSDebug.h>
-#include <sys/proc.h>
-#include <sys/kauth.h>
-
-#if CONFIG_MACF
-
-extern "C" {
-#include <security/mac_framework.h>
-};
-#include <sys/kauth.h>
-
-#define IOMACF_LOG 0
-
-#endif /* CONFIG_MACF */
#include <IOKit/assert.h>
#include "IOServicePrivate.h"
-#include "IOKitKernelInternal.h"
-
-#define SCALAR64(x) ((io_user_scalar_t)((unsigned int)x))
-#define SCALAR32(x) ((uint32_t )x)
-#define ARG32(x) ((void *)(uintptr_t)SCALAR32(x))
-#define REF64(x) ((io_user_reference_t)((UInt64)(x)))
-#define REF32(x) ((int)(x))
-
-enum
-{
- kIOUCAsync0Flags = 3ULL,
- kIOUCAsync64Flag = 1ULL
-};
-
-#if IOKITSTATS
-
-#define IOStatisticsRegisterCounter() \
-do { \
- reserved->counter = IOStatistics::registerUserClient(this); \
-} while (0)
-
-#define IOStatisticsUnregisterCounter() \
-do { \
- if (reserved) \
- IOStatistics::unregisterUserClient(reserved->counter); \
-} while (0)
-
-#define IOStatisticsClientCall() \
-do { \
- IOStatistics::countUserClientCall(client); \
-} while (0)
-
-#else
-
-#define IOStatisticsRegisterCounter()
-#define IOStatisticsUnregisterCounter()
-#define IOStatisticsClientCall()
-
-#endif /* IOKITSTATS */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -129,7 +65,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 );
@@ -255,7 +190,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
@@ -424,10 +359,8 @@
if( IKOT_IOKIT_CONNECT == type)
{
- if( (client = OSDynamicCast( IOUserClient, obj ))) {
- IOStatisticsClientCall();
+ if( (client = OSDynamicCast( IOUserClient, obj )))
client->clientDied();
- }
}
else if( IKOT_IOKIT_OBJECT == type)
{
@@ -450,12 +383,12 @@
struct PingMsg {
mach_msg_header_t msgHdr;
- OSNotificationHeader64 notifyHeader;
+ OSNotificationHeader notifyHeader;
};
enum { kMaxOutstanding = 1024 };
- PingMsg * pingMsg;
+ PingMsg * pingMsg;
vm_size_t msgSize;
OSArray * newSet;
OSObject * lastEntry;
@@ -464,12 +397,11 @@
public:
virtual bool init( mach_port_t port, natural_t type,
- void * reference, vm_size_t referenceSize,
- bool clientIs64 );
+ OSAsyncReference reference );
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();
@@ -483,21 +415,16 @@
mach_msg_header_t msgHdr;
mach_msg_body_t msgBody;
mach_msg_port_descriptor_t ports[1];
- OSNotificationHeader64 notifyHeader __attribute__ ((packed));
+ OSNotificationHeader notifyHeader;
};
PingMsg * pingMsg;
vm_size_t msgSize;
- uint8_t clientIs64;
- int owningPID;
public:
virtual bool init( mach_port_t port, natural_t type,
- void * reference, vm_size_t referenceSize,
- vm_size_t extraSize,
- bool clientIs64 );
-
+ OSAsyncReference reference, vm_size_t extraSize );
virtual void free();
static IOReturn _handler( void * target, void * ref,
@@ -578,20 +505,13 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
bool IOServiceUserNotification::init( mach_port_t port, natural_t type,
- void * reference, vm_size_t referenceSize,
- bool clientIs64 )
-{
- if( !super::init())
- return( false );
-
+ OSAsyncReference reference )
+{
newSet = OSArray::withCapacity( 1 );
if( !newSet)
return( false );
- if (referenceSize > sizeof(OSAsyncReference64))
- return( false );
-
- msgSize = sizeof(PingMsg) - sizeof(OSAsyncReference64) + referenceSize;
+ msgSize = sizeof( PingMsg) + 0;
pingMsg = (PingMsg *) IOMalloc( msgSize);
if( !pingMsg)
return( false );
@@ -607,9 +527,9 @@
pingMsg->notifyHeader.size = 0;
pingMsg->notifyHeader.type = type;
- bcopy( reference, pingMsg->notifyHeader.reference, referenceSize );
-
- return( true );
+ bcopy( reference, pingMsg->notifyHeader.reference, sizeof(OSAsyncReference) );
+
+ return( super::init() );
}
void IOServiceUserNotification::free( void )
@@ -626,12 +546,8 @@
super::free();
- if( _pingMsg && _msgSize) {
- if (_pingMsg->msgHdr.msgh_remote_port) {
- iokit_release_port_send(_pingMsg->msgHdr.msgh_remote_port);
- }
- IOFree(_pingMsg, _msgSize);
- }
+ if( _pingMsg && _msgSize)
+ IOFree( _pingMsg, _msgSize);
if( _lastEntry)
_lastEntry->release();
@@ -641,7 +557,7 @@
}
bool IOServiceUserNotification::_handler( void * target,
- void * ref, IOService * newService, IONotifier * notifier )
+ void * ref, IOService * newService )
{
return( ((IOServiceUserNotification *) target)->handler( ref, newService ));
}
@@ -675,15 +591,13 @@
else
pingMsg->msgHdr.msgh_local_port = NULL;
- kr = mach_msg_send_from_kernel_with_options( &pingMsg->msgHdr,
- pingMsg->msgHdr.msgh_size,
- (MACH_SEND_MSG | MACH_SEND_ALWAYS | MACH_SEND_IMPORTANCE),
- 0);
+ 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 );
@@ -722,21 +636,11 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
bool IOServiceMessageUserNotification::init( mach_port_t port, natural_t type,
- void * reference, vm_size_t referenceSize, vm_size_t extraSize,
- bool client64 )
-{
- if( !super::init())
- return( false );
-
- if (referenceSize > sizeof(OSAsyncReference64))
- return( false );
-
- clientIs64 = client64;
-
- owningPID = proc_selfpid();
-
- extraSize += sizeof(IOServiceInterestContent64);
- msgSize = sizeof(PingMsg) - sizeof(OSAsyncReference64) + referenceSize + extraSize;
+ OSAsyncReference reference, vm_size_t extraSize )
+{
+
+ extraSize += sizeof(IOServiceInterestContent);
+ msgSize = sizeof( PingMsg) + extraSize;
pingMsg = (PingMsg *) IOMalloc( msgSize);
if( !pingMsg)
return( false );
@@ -759,9 +663,9 @@
pingMsg->notifyHeader.size = extraSize;
pingMsg->notifyHeader.type = type;
- bcopy( reference, pingMsg->notifyHeader.reference, referenceSize );
-
- return( true );
+ bcopy( reference, pingMsg->notifyHeader.reference, sizeof(OSAsyncReference) );
+
+ return( super::init() );
}
void IOServiceMessageUserNotification::free( void )
@@ -774,12 +678,8 @@
super::free();
- if( _pingMsg && _msgSize) {
- if (_pingMsg->msgHdr.msgh_remote_port) {
- iokit_release_port_send(_pingMsg->msgHdr.msgh_remote_port);
- }
+ if( _pingMsg && _msgSize)
IOFree( _pingMsg, _msgSize);
- }
}
IOReturn IOServiceMessageUserNotification::_handler( void * target, void * ref,
@@ -794,39 +694,22 @@
UInt32 messageType, IOService * provider,
void * messageArgument, vm_size_t argSize )
{
- kern_return_t kr;
- ipc_port_t thisPort, providerPort;
- IOServiceInterestContent64 * data = (IOServiceInterestContent64 *)
- ((((uint8_t *) pingMsg) + msgSize) - pingMsg->notifyHeader.size);
- // == pingMsg->notifyHeader.content;
-
- if (kIOMessageCopyClientID == messageType)
- {
- *((void **) messageArgument) = OSNumber::withNumber(owningPID, 32);
- return (kIOReturnSuccess);
- }
+ kern_return_t kr;
+ ipc_port_t thisPort, providerPort;
+ IOServiceInterestContent * data = (IOServiceInterestContent *)
+ pingMsg->notifyHeader.content;
data->messageType = messageType;
-
- if( argSize == 0)
- {
- data->messageArgument[0] = (io_user_reference_t) messageArgument;
- if (clientIs64)
- argSize = sizeof(data->messageArgument[0]);
- else
- {
- data->messageArgument[0] |= (data->messageArgument[0] << 32);
- argSize = sizeof(uint32_t);
- }
- }
- else
- {
+ if( argSize == 0) {
+ argSize = sizeof( messageArgument);
+ data->messageArgument[0] = messageArgument;
+ } else {
if( argSize > kIOUserNotifyMaxMessageSize)
argSize = kIOUserNotifyMaxMessageSize;
bcopy( messageArgument, data->messageArgument, argSize );
}
- pingMsg->msgHdr.msgh_size = msgSize - pingMsg->notifyHeader.size
- + sizeof( IOServiceInterestContent64 )
+ pingMsg->msgHdr.msgh_size = sizeof( PingMsg)
+ + sizeof( IOServiceInterestContent )
- sizeof( data->messageArgument)
+ argSize;
@@ -834,17 +717,15 @@
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_with_options( &pingMsg->msgHdr,
- pingMsg->msgHdr.msgh_size,
- (MACH_SEND_MSG | MACH_SEND_ALWAYS | MACH_SEND_IMPORTANCE),
- 0);
+ kr = mach_msg_send_from_kernel( &pingMsg->msgHdr,
+ pingMsg->msgHdr.msgh_size);
if( thisPort)
iokit_release_port( thisPort );
if( providerPort)
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 );
}
@@ -871,197 +752,65 @@
mach_port_t wakePort,
void *callback, void *refcon)
{
- asyncRef[kIOAsyncReservedIndex] = ((uintptr_t) wakePort)
- | (kIOUCAsync0Flags & asyncRef[kIOAsyncReservedIndex]);
- asyncRef[kIOAsyncCalloutFuncIndex] = (uintptr_t) callback;
- asyncRef[kIOAsyncCalloutRefconIndex] = (uintptr_t) refcon;
-}
-
-void IOUserClient::setAsyncReference64(OSAsyncReference64 asyncRef,
- mach_port_t wakePort,
- mach_vm_address_t callback, io_user_reference_t refcon)
-{
- asyncRef[kIOAsyncReservedIndex] = ((io_user_reference_t) wakePort)
- | (kIOUCAsync0Flags & asyncRef[kIOAsyncReservedIndex]);
- asyncRef[kIOAsyncCalloutFuncIndex] = (io_user_reference_t) callback;
- asyncRef[kIOAsyncCalloutRefconIndex] = refcon;
-}
-
-void IOUserClient::setAsyncReference64(OSAsyncReference64 asyncRef,
- mach_port_t wakePort,
- mach_vm_address_t callback, io_user_reference_t refcon, task_t task)
-{
- setAsyncReference64(asyncRef, wakePort, callback, refcon);
- if (vm_map_is_64bit(get_task_map(task))) {
- asyncRef[kIOAsyncReservedIndex] |= kIOUCAsync64Flag;
+ asyncRef[kIOAsyncReservedIndex] = (natural_t) wakePort;
+ asyncRef[kIOAsyncCalloutFuncIndex] = (natural_t) callback;
+ asyncRef[kIOAsyncCalloutRefconIndex] = (natural_t) refcon;
+}
+
+IOReturn IOUserClient::clientHasPrivilege( void * securityToken,
+ const char * privilegeName )
+{
+ kern_return_t kr;
+ security_token_t token;
+ mach_msg_type_number_t count;
+
+ count = TASK_SECURITY_TOKEN_COUNT;
+ kr = task_info( (task_t) securityToken, TASK_SECURITY_TOKEN,
+ (task_info_t) &token, &count );
+
+ if (KERN_SUCCESS != kr)
+ {}
+ else if (!strcmp(privilegeName, kIOClientPrivilegeAdministrator))
+ {
+ if (0 != token.val[0])
+ kr = kIOReturnNotPrivileged;
}
-}
-
-static OSDictionary * CopyConsoleUser(UInt32 uid)
-{
- OSArray * array;
- OSDictionary * user = 0;
+ else if (!strcmp(privilegeName, kIOClientPrivilegeLocalUser))
+ {
+ OSArray * array;
+ OSDictionary * user = 0;
if ((array = OSDynamicCast(OSArray,
IORegistryEntry::getRegistryRoot()->copyProperty(gIOConsoleUsersKey))))
{
for (unsigned int idx = 0;
(user = OSDynamicCast(OSDictionary, array->getObject(idx)));
- idx++) {
- OSNumber * num;
-
- if ((num = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionUIDKey)))
- && (uid == num->unsigned32BitValue())) {
- user->retain();
- break;
- }
+ idx++)
+ {
+ OSNumber * num;
+ if ((num = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionUIDKey)))
+ && (token.val[0] == num->unsigned32BitValue()))
+ break;
}
array->release();
}
- return user;
-}
-
-static OSDictionary * CopyUserOnConsole(void)
-{
- OSArray * array;
- OSDictionary * user = 0;
-
- if ((array = OSDynamicCast(OSArray,
- IORegistryEntry::getRegistryRoot()->copyProperty(gIOConsoleUsersKey))))
- {
- for (unsigned int idx = 0;
- (user = OSDynamicCast(OSDictionary, array->getObject(idx)));
- idx++)
- {
- if (kOSBooleanTrue == user->getObject(gIOConsoleSessionOnConsoleKey))
- {
- user->retain();
- break;
- }
- }
- array->release();
+ if (!user)
+ kr = kIOReturnNotPrivileged;
}
- return (user);
-}
-
-IOReturn IOUserClient::clientHasPrivilege( void * securityToken,
- const char * privilegeName )
-{
- kern_return_t kr;
- security_token_t token;
- mach_msg_type_number_t count;
- task_t task;
- OSDictionary * user;
- bool secureConsole;
-
-
- if (!strncmp(privilegeName, kIOClientPrivilegeForeground,
- sizeof(kIOClientPrivilegeForeground)))
- {
- /* is graphics access denied for current task? */
- if (proc_get_effective_task_policy(current_task(), TASK_POLICY_GPU_DENY) != 0)
- return (kIOReturnNotPrivileged);
- else
- return (kIOReturnSuccess);
- }
-
- if (!strncmp(privilegeName, kIOClientPrivilegeConsoleSession,
- sizeof(kIOClientPrivilegeConsoleSession)))
- {
- kauth_cred_t cred;
- proc_t p;
-
- task = (task_t) securityToken;
- if (!task)
- task = current_task();
- p = (proc_t) get_bsdtask_info(task);
- kr = kIOReturnNotPrivileged;
-
- if (p && (cred = kauth_cred_proc_ref(p)))
- {
- user = CopyUserOnConsole();
- if (user)
- {
- OSNumber * num;
- if ((num = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionAuditIDKey)))
- && (cred->cr_audit.as_aia_p->ai_asid == (au_asid_t) num->unsigned32BitValue()))
- {
- kr = kIOReturnSuccess;
- }
- user->release();
- }
- kauth_cred_unref(&cred);
- }
- return (kr);
- }
-
- if ((secureConsole = !strncmp(privilegeName, kIOClientPrivilegeSecureConsoleProcess,
- sizeof(kIOClientPrivilegeSecureConsoleProcess))))
- task = (task_t)((IOUCProcessToken *)securityToken)->token;
else
- task = (task_t)securityToken;
-
- count = TASK_SECURITY_TOKEN_COUNT;
- kr = task_info( task, TASK_SECURITY_TOKEN, (task_info_t) &token, &count );
-
- if (KERN_SUCCESS != kr)
- {}
- else if (!strncmp(privilegeName, kIOClientPrivilegeAdministrator,
- sizeof(kIOClientPrivilegeAdministrator))) {
- if (0 != token.val[0])
- kr = kIOReturnNotPrivileged;
- } else if (!strncmp(privilegeName, kIOClientPrivilegeLocalUser,
- sizeof(kIOClientPrivilegeLocalUser))) {
- user = CopyConsoleUser(token.val[0]);
- if ( user )
- user->release();
- else
- kr = kIOReturnNotPrivileged;
- } else if (secureConsole || !strncmp(privilegeName, kIOClientPrivilegeConsoleUser,
- sizeof(kIOClientPrivilegeConsoleUser))) {
- user = CopyConsoleUser(token.val[0]);
- if ( user ) {
- if (user->getObject(gIOConsoleSessionOnConsoleKey) != kOSBooleanTrue)
- kr = kIOReturnNotPrivileged;
- else if ( secureConsole ) {
- OSNumber * pid = OSDynamicCast(OSNumber, user->getObject(gIOConsoleSessionSecureInputPIDKey));
- if ( pid && pid->unsigned32BitValue() != ((IOUCProcessToken *)securityToken)->pid)
- kr = kIOReturnNotPrivileged;
- }
- user->release();
- }
- else
- kr = kIOReturnNotPrivileged;
- } else
- kr = kIOReturnUnsupported;
+ kr = kIOReturnUnsupported;
return (kr);
-}
-
-bool IOUserClient::init()
-{
- if (getPropertyTable() || super::init())
- return reserve();
-
- return false;
-}
-
-bool IOUserClient::init(OSDictionary * dictionary)
-{
- if (getPropertyTable() || super::init(dictionary))
- return reserve();
-
- return false;
}
bool IOUserClient::initWithTask(task_t owningTask,
void * securityID,
UInt32 type )
-{
- if (getPropertyTable() || super::init())
- return reserve();
-
- return false;
+{
+ if( getPropertyTable())
+ return true;
+ else
+ return super::init();
}
bool IOUserClient::initWithTask(task_t owningTask,
@@ -1077,30 +826,11 @@
return( ok );
}
-bool IOUserClient::reserve()
-{
- if(!reserved) {
- reserved = IONew(ExpansionData, 1);
- if (!reserved) {
- return false;
- }
- }
- setTerminateDefer(NULL, true);
- IOStatisticsRegisterCounter();
-
- return true;
-}
-
void IOUserClient::free()
{
if( mappings)
mappings->release();
-
- IOStatisticsUnregisterCounter();
-
- if (reserved)
- IODelete(reserved, ExpansionData, 1);
-
+
super::free();
}
@@ -1127,14 +857,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 )
{
@@ -1153,23 +875,12 @@
return( kIOReturnUnsupported);
}
-#if !__LP64__
IOMemoryMap * IOUserClient::mapClientMemory(
IOOptionBits type,
task_t task,
IOOptionBits mapFlags,
IOVirtualAddress atAddress )
{
- return (NULL);
-}
-#endif
-
-IOMemoryMap * IOUserClient::mapClientMemory64(
- IOOptionBits type,
- task_t task,
- IOOptionBits mapFlags,
- mach_vm_address_t atAddress )
-{
IOReturn err;
IOOptionBits options = 0;
IOMemoryDescriptor * memory;
@@ -1181,7 +892,7 @@
options = (options & ~kIOMapUserOptionsMask)
| (mapFlags & kIOMapUserOptionsMask);
- map = memory->createMappingInTask( task, atAddress, options );
+ map = memory->map( task, atAddress, options );
memory->release();
}
@@ -1194,6 +905,7 @@
mach_port_name_t name;
name = IOMachPort::makeSendRightForTask( task, obj, IKOT_IOKIT_OBJECT );
+ assert( name );
*(mach_port_name_t *)clientObj = name;
return kIOReturnSuccess;
@@ -1249,143 +961,48 @@
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,
IOReturn result, void *args[], UInt32 numArgs)
{
- OSAsyncReference64 reference64;
- io_user_reference_t args64[kMaxAsyncArgs];
- unsigned int idx;
-
- if (numArgs > kMaxAsyncArgs)
- return kIOReturnMessageTooLarge;
-
- for (idx = 0; idx < kOSAsyncRef64Count; idx++)
- reference64[idx] = REF64(reference[idx]);
-
- for (idx = 0; idx < numArgs; idx++)
- args64[idx] = REF64(args[idx]);
-
- return (sendAsyncResult64(reference64, result, args64, numArgs));
-}
-
-IOReturn IOUserClient::sendAsyncResult64WithOptions(OSAsyncReference64 reference,
- IOReturn result, io_user_reference_t args[], UInt32 numArgs, IOOptionBits options)
-{
- return _sendAsyncResult64(reference, result, args, numArgs, options);
-}
-
-IOReturn IOUserClient::sendAsyncResult64(OSAsyncReference64 reference,
- IOReturn result, io_user_reference_t args[], UInt32 numArgs)
-{
- return _sendAsyncResult64(reference, result, args, numArgs, 0);
-}
-
-IOReturn IOUserClient::_sendAsyncResult64(OSAsyncReference64 reference,
- IOReturn result, io_user_reference_t args[], UInt32 numArgs, IOOptionBits options)
-{
- struct ReplyMsg
- {
- mach_msg_header_t msgHdr;
- union
- {
- struct
- {
- OSNotificationHeader notifyHdr;
- IOAsyncCompletionContent asyncContent;
- uint32_t args[kMaxAsyncArgs];
- } msg32;
- struct
- {
- OSNotificationHeader64 notifyHdr;
- IOAsyncCompletionContent asyncContent;
- io_user_reference_t args[kMaxAsyncArgs] __attribute__ ((packed));
- } msg64;
- } m;
+ struct ReplyMsg {
+ mach_msg_header_t msgHdr;
+ OSNotificationHeader notifyHdr;
+ IOAsyncCompletionContent asyncContent;
+ void * args[kMaxAsyncArgs];
};
- ReplyMsg replyMsg;
- mach_port_t replyPort;
+ ReplyMsg replyMsg;
+ mach_port_t replyPort;
kern_return_t kr;
// If no reply port, do nothing.
- replyPort = (mach_port_t) (reference[0] & ~kIOUCAsync0Flags);
- if (replyPort == MACH_PORT_NULL)
+ replyPort = (mach_port_t) reference[0];
+ if(replyPort == MACH_PORT_NULL)
return kIOReturnSuccess;
- if (numArgs > kMaxAsyncArgs)
+ if(numArgs > kMaxAsyncArgs)
return kIOReturnMessageTooLarge;
-
replyMsg.msgHdr.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND /*remote*/,
- 0 /*local*/);
+ 0 /*local*/);
+ replyMsg.msgHdr.msgh_size =
+ sizeof(replyMsg) - (kMaxAsyncArgs-numArgs)*sizeof(void *);
replyMsg.msgHdr.msgh_remote_port = replyPort;
- replyMsg.msgHdr.msgh_local_port = 0;
- replyMsg.msgHdr.msgh_id = kOSNotificationMessageID;
- if (kIOUCAsync64Flag & reference[0])
- {
- replyMsg.msgHdr.msgh_size =
- sizeof(replyMsg.msgHdr) + sizeof(replyMsg.m.msg64)
- - (kMaxAsyncArgs - numArgs) * sizeof(io_user_reference_t);
- replyMsg.m.msg64.notifyHdr.size = sizeof(IOAsyncCompletionContent)
- + numArgs * sizeof(io_user_reference_t);
- replyMsg.m.msg64.notifyHdr.type = kIOAsyncCompletionNotificationType;
- bcopy(reference, replyMsg.m.msg64.notifyHdr.reference, sizeof(OSAsyncReference64));
-
- replyMsg.m.msg64.asyncContent.result = result;
- if (numArgs)
- bcopy(args, replyMsg.m.msg64.args, numArgs * sizeof(io_user_reference_t));
- }
- else
- {
- unsigned int idx;
-
- replyMsg.msgHdr.msgh_size =
- sizeof(replyMsg.msgHdr) + sizeof(replyMsg.m.msg32)
- - (kMaxAsyncArgs - numArgs) * sizeof(uint32_t);
-
- replyMsg.m.msg32.notifyHdr.size = sizeof(IOAsyncCompletionContent)
- + numArgs * sizeof(uint32_t);
- replyMsg.m.msg32.notifyHdr.type = kIOAsyncCompletionNotificationType;
-
- for (idx = 0; idx < kOSAsyncRefCount; idx++)
- replyMsg.m.msg32.notifyHdr.reference[idx] = REF32(reference[idx]);
-
- replyMsg.m.msg32.asyncContent.result = result;
-
- for (idx = 0; idx < numArgs; idx++)
- replyMsg.m.msg32.args[idx] = REF32(args[idx]);
- }
-
- if ((options & kIOUserNotifyOptionCanDrop) != 0) {
- kr = mach_msg_send_from_kernel_with_options( &replyMsg.msgHdr,
- replyMsg.msgHdr.msgh_size, MACH_SEND_TIMEOUT, MACH_MSG_TIMEOUT_NONE);
- } else {
- /* Fail on full queue. */
- kr = mach_msg_send_from_kernel_proper( &replyMsg.msgHdr,
- replyMsg.msgHdr.msgh_size);
- }
- if ((KERN_SUCCESS != kr) && (MACH_SEND_TIMED_OUT != kr))
- IOLog("%s: mach_msg_send_from_kernel_proper {%x}\n", __FILE__, kr );
+ replyMsg.msgHdr.msgh_local_port = 0;
+ replyMsg.msgHdr.msgh_id = kOSNotificationMessageID;
+
+ replyMsg.notifyHdr.size = sizeof(IOAsyncCompletionContent)
+ + numArgs*sizeof(void *);
+ replyMsg.notifyHdr.type = kIOAsyncCompletionNotificationType;
+ bcopy( reference, replyMsg.notifyHdr.reference, sizeof(OSAsyncReference));
+
+ replyMsg.asyncContent.result = result;
+ if(numArgs > 0)
+ bcopy(args, replyMsg.args, sizeof(void *)*numArgs);
+ kr = mach_msg_send_from_kernel( &replyMsg.msgHdr,
+ replyMsg.msgHdr.msgh_size);
+ if( KERN_SUCCESS != kr)
+ IOLog("%s: mach_msg_send_from_kernel {%x}\n", __FILE__, kr );
return kr;
}
-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -1402,16 +1019,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 );
}
@@ -1449,7 +1066,7 @@
my_cstr = superclass->getClassName();
if (my_cstr) {
- strlcpy(class_name, my_cstr, sizeof(io_name_t));
+ strncpy(class_name, my_cstr, sizeof(io_name_t)-1);
return( kIOReturnSuccess );
}
return (kIOReturnNotFound);
@@ -1488,7 +1105,7 @@
my_cstr = identifier->getCStringNoCopy();
if (my_cstr) {
- strlcpy(bundle_name, identifier->getCStringNoCopy(), sizeof(io_name_t));
+ strncpy(bundle_name, identifier->getCStringNoCopy(), sizeof(io_name_t)-1);
return( kIOReturnSuccess );
}
@@ -1511,7 +1128,7 @@
/* Routine io_object_get_retain_count */
kern_return_t is_io_object_get_retain_count(
io_object_t object,
- uint32_t *retainCount )
+ int *retainCount )
{
if( !object)
return( kIOReturnBadArgument );
@@ -1592,12 +1209,12 @@
io_object_t service,
io_buf_ptr_t matching,
mach_msg_type_number_t matchingCnt,
- kern_return_t *result,
+ natural_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);
@@ -1644,7 +1261,7 @@
mach_port_t master_port,
io_buf_ptr_t matching,
mach_msg_type_number_t matchingCnt,
- kern_return_t *result,
+ natural_t *result,
io_object_t *existing )
{
kern_return_t kr;
@@ -1664,68 +1281,14 @@
return( kr );
}
-
-/* Routine io_service_get_matching_service */
-kern_return_t is_io_service_get_matching_service(
- mach_port_t master_port,
- io_string_t matching,
- io_service_t *service )
-{
- kern_return_t kr;
- OSObject * obj;
- OSDictionary * dict;
-
- if( master_port != master_device_port)
- return( kIOReturnNotPrivileged);
-
- obj = OSUnserializeXML( matching );
-
- if( (dict = OSDynamicCast( OSDictionary, obj))) {
- *service = IOService::copyMatchingService( dict );
- kr = *service ? kIOReturnSuccess : kIOReturnNotFound;
- } else
- kr = kIOReturnBadArgument;
-
- if( obj)
- obj->release();
-
- return( kr );
-}
-
-/* Routine io_service_get_matching_services_ool */
-kern_return_t is_io_service_get_matching_service_ool(
- mach_port_t master_port,
- io_buf_ptr_t matching,
- mach_msg_type_number_t matchingCnt,
- kern_return_t *result,
- io_object_t *service )
-{
- 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);
-
- if( KERN_SUCCESS == kr) {
- // must return success after vm_map_copyout() succeeds
- *result = is_io_service_get_matching_service( master_port,
- (char *) data, service );
- vm_deallocate( kernel_map, data, matchingCnt );
- }
-
- return( kr );
-}
-
-
-static kern_return_t internal_io_service_add_notification(
+/* Routine io_service_add_notification */
+kern_return_t is_io_service_add_notification(
mach_port_t master_port,
io_name_t notification_type,
io_string_t matching,
mach_port_t port,
- void * reference,
- vm_size_t referenceSize,
- bool client64,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
io_object_t * notification )
{
IOServiceUserNotification * userNotify = 0;
@@ -1765,17 +1328,17 @@
userNotify = new IOServiceUserNotification;
if( userNotify && !userNotify->init( port, userMsgType,
- reference, referenceSize, client64)) {
- iokit_release_port_send(port);
+ reference)) {
userNotify->release();
userNotify = 0;
}
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;
@@ -1790,67 +1353,6 @@
dict->release();
return( err );
-}
-
-
-/* Routine io_service_add_notification */
-kern_return_t is_io_service_add_notification(
- mach_port_t master_port,
- io_name_t notification_type,
- io_string_t matching,
- mach_port_t port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- io_object_t * notification )
-{
- return (internal_io_service_add_notification(master_port, notification_type,
- matching, port, &reference[0], sizeof(io_async_ref_t),
- false, notification));
-}
-
-/* Routine io_service_add_notification_64 */
-kern_return_t is_io_service_add_notification_64(
- mach_port_t master_port,
- io_name_t notification_type,
- io_string_t matching,
- mach_port_t wake_port,
- io_async_ref64_t reference,
- mach_msg_type_number_t referenceCnt,
- io_object_t *notification )
-{
- return (internal_io_service_add_notification(master_port, notification_type,
- matching, wake_port, &reference[0], sizeof(io_async_ref64_t),
- true, notification));
-}
-
-
-static kern_return_t internal_io_service_add_notification_ool(
- mach_port_t master_port,
- io_name_t notification_type,
- io_buf_ptr_t matching,
- mach_msg_type_number_t matchingCnt,
- mach_port_t wake_port,
- void * reference,
- vm_size_t referenceSize,
- bool client64,
- kern_return_t *result,
- io_object_t *notification )
-{
- 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);
-
- if( KERN_SUCCESS == kr) {
- // must return success after vm_map_copyout() succeeds
- *result = internal_io_service_add_notification( master_port, notification_type,
- (char *) data, wake_port, reference, referenceSize, client64, notification );
- vm_deallocate( kernel_map, data, matchingCnt );
- }
-
- return( kr );
}
/* Routine io_service_add_notification_ool */
@@ -1862,30 +1364,26 @@
mach_port_t wake_port,
io_async_ref_t reference,
mach_msg_type_number_t referenceCnt,
- kern_return_t *result,
+ natural_t *result,
io_object_t *notification )
{
- return (internal_io_service_add_notification_ool(master_port, notification_type,
- matching, matchingCnt, wake_port, &reference[0], sizeof(io_async_ref_t),
- false, result, notification));
-}
-
-/* Routine io_service_add_notification_ool_64 */
-kern_return_t is_io_service_add_notification_ool_64(
- mach_port_t master_port,
- io_name_t notification_type,
- io_buf_ptr_t matching,
- mach_msg_type_number_t matchingCnt,
- mach_port_t wake_port,
- io_async_ref64_t reference,
- mach_msg_type_number_t referenceCnt,
- kern_return_t *result,
- io_object_t *notification )
-{
- return (internal_io_service_add_notification_ool(master_port, notification_type,
- matching, matchingCnt, wake_port, &reference[0], sizeof(io_async_ref64_t),
- true, result, notification));
-}
+ 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);
+
+ if( KERN_SUCCESS == kr) {
+ // must return success after vm_map_copyout() succeeds
+ *result = is_io_service_add_notification( master_port, notification_type,
+ (char *) data, wake_port, reference, referenceCnt, notification );
+ vm_deallocate( kernel_map, data, matchingCnt );
+ }
+
+ return( kr );
+}
+
/* Routine io_service_add_notification_old */
kern_return_t is_io_service_add_notification_old(
@@ -1893,7 +1391,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 )
{
@@ -1901,14 +1398,13 @@
matching, port, &ref, 1, notification ));
}
-
-static kern_return_t internal_io_service_add_interest_notification(
+/* Routine io_service_add_message_notification */
+kern_return_t is_io_service_add_interest_notification(
io_object_t _service,
io_name_t type_of_interest,
mach_port_t port,
- void * reference,
- vm_size_t referenceSize,
- bool client64,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
io_object_t * notification )
{
@@ -1925,10 +1421,7 @@
userNotify = new IOServiceMessageUserNotification;
if( userNotify && !userNotify->init( port, kIOServiceMessageNotificationType,
- reference, referenceSize,
- kIOUserNotifyMaxMessageSize,
- client64 )) {
- iokit_release_port_send(port);
+ reference, kIOUserNotifyMaxMessageSize )) {
userNotify->release();
userNotify = 0;
}
@@ -1951,33 +1444,6 @@
return( err );
}
-/* Routine io_service_add_message_notification */
-kern_return_t is_io_service_add_interest_notification(
- io_object_t service,
- io_name_t type_of_interest,
- mach_port_t port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- io_object_t * notification )
-{
- return (internal_io_service_add_interest_notification(service, type_of_interest,
- port, &reference[0], sizeof(io_async_ref_t), false, notification));
-}
-
-/* Routine io_service_add_interest_notification_64 */
-kern_return_t is_io_service_add_interest_notification_64(
- io_object_t service,
- io_name_t type_of_interest,
- mach_port_t wake_port,
- io_async_ref64_t reference,
- mach_msg_type_number_t referenceCnt,
- io_object_t *notification )
-{
- return (internal_io_service_add_interest_notification(service, type_of_interest,
- wake_port, &reference[0], sizeof(io_async_ref64_t), true, notification));
-}
-
-
/* Routine io_service_acknowledge_notification */
kern_return_t is_io_service_acknowledge_notification(
io_object_t _service,
@@ -1986,7 +1452,7 @@
{
CHECK( IOService, _service, service );
- return( service->acknowledgeNotification( (IONotificationRef)(uintptr_t) notify_ref,
+ return( service->acknowledgeNotification( (IONotificationRef) notify_ref,
(IOOptionBits) response ));
}
@@ -1999,7 +1465,6 @@
{
CHECK( IOUserClient, connection, client );
- IOStatisticsClientCall();
return( client->getNotificationSemaphore( (UInt32) notification_type,
semaphore ));
}
@@ -2026,7 +1491,7 @@
kern_return_t is_io_registry_create_iterator(
mach_port_t master_port,
io_name_t plane,
- uint32_t options,
+ int options,
io_object_t *iterator )
{
if( master_port != master_device_port)
@@ -2042,7 +1507,7 @@
kern_return_t is_io_registry_entry_create_iterator(
io_object_t registry_entry,
io_name_t plane,
- uint32_t options,
+ int options,
io_object_t *iterator )
{
CHECK( IORegistryEntry, registry_entry, entry );
@@ -2180,22 +1645,10 @@
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.
-static kern_return_t copyoutkdata( const void * data, vm_size_t len,
+static kern_return_t copyoutkdata( void * data, vm_size_t len,
io_buf_ptr_t * buf )
{
kern_return_t err;
@@ -2215,7 +1668,7 @@
kern_return_t is_io_registry_entry_get_property_bytes(
io_object_t registry_entry,
io_name_t property_name,
- io_struct_inband_t buf,
+ io_scalar_inband_t buf,
mach_msg_type_number_t *dataCnt )
{
OSObject * obj;
@@ -2273,7 +1726,6 @@
return( ret );
}
-
/* Routine io_registry_entry_get_property */
kern_return_t is_io_registry_entry_get_property(
io_object_t registry_entry,
@@ -2317,7 +1769,7 @@
io_object_t registry_entry,
io_name_t plane,
io_name_t property_name,
- uint32_t options,
+ int options,
io_buf_ptr_t *properties,
mach_msg_type_number_t *propertiesCnt )
{
@@ -2390,7 +1842,7 @@
io_object_t registry_entry,
io_buf_ptr_t properties,
mach_msg_type_number_t propertiesCnt,
- kern_return_t * result)
+ natural_t * result)
{
OSObject * obj;
kern_return_t err;
@@ -2400,29 +1852,20 @@
CHECK( IORegistryEntry, registry_entry, entry );
- if( propertiesCnt > sizeof(io_struct_inband_t) * 1024)
- return( kIOReturnMessageTooLarge);
-
err = vm_map_copyout( kernel_map, &map_data, (vm_map_copy_t) properties );
data = CAST_DOWN(vm_offset_t, map_data);
if( KERN_SUCCESS == err) {
// must return success after vm_map_copyout() succeeds
- obj = OSUnserializeXML( (const char *) data, propertiesCnt );
+ obj = OSUnserializeXML( (const char *) data );
vm_deallocate( kernel_map, data, propertiesCnt );
- if (!obj)
- res = kIOReturnBadArgument;
-#if CONFIG_MACF
- else if (0 != mac_iokit_check_set_properties(kauth_cred_get(),
- registry_entry, obj))
- res = kIOReturnNotPermitted;
-#endif
- else
+ if( obj) {
res = entry->setProperties( obj );
- if (obj)
- obj->release();
+ obj->release();
+ } else
+ res = kIOReturnBadArgument;
} else
res = err;
@@ -2461,7 +1904,7 @@
/* Routine io_service_get_busy_state */
kern_return_t is_io_service_get_busy_state(
io_object_t _service,
- uint32_t *busyState )
+ int *busyState )
{
CHECK( IOService, _service, service );
@@ -2473,15 +1916,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 );
}
@@ -2491,134 +1930,43 @@
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 */
kern_return_t is_io_service_request_probe(
io_object_t _service,
- uint32_t options )
+ int options )
{
CHECK( IOService, _service, service );
return( service->requestProbe( options ));
}
-/* Routine io_service_open_ndr */
-kern_return_t is_io_service_open_extended(
+
+/* Routine io_service_open */
+kern_return_t is_io_service_open(
io_object_t _service,
task_t owningTask,
- uint32_t connect_type,
- NDR_record_t ndr,
- io_buf_ptr_t properties,
- mach_msg_type_number_t propertiesCnt,
- kern_return_t * result,
+ int connect_type,
io_object_t *connection )
{
- IOUserClient * client = 0;
- kern_return_t err = KERN_SUCCESS;
- IOReturn res = kIOReturnSuccess;
- OSDictionary * propertiesDict = 0;
- bool crossEndian;
- bool disallowAccess;
+ IOUserClient * client;
+ IOReturn err;
CHECK( IOService, _service, service );
- do
- {
- if (properties)
- {
- OSObject * obj;
- vm_offset_t data;
- vm_map_offset_t map_data;
-
- if( propertiesCnt > sizeof(io_struct_inband_t))
- return( kIOReturnMessageTooLarge);
-
- err = vm_map_copyout( kernel_map, &map_data, (vm_map_copy_t) properties );
- res = err;
- data = CAST_DOWN(vm_offset_t, map_data);
- if (KERN_SUCCESS == err)
- {
- // must return success after vm_map_copyout() succeeds
- obj = OSUnserializeXML( (const char *) data, propertiesCnt );
- vm_deallocate( kernel_map, data, propertiesCnt );
- propertiesDict = OSDynamicCast(OSDictionary, obj);
- if (!propertiesDict)
- {
- res = kIOReturnBadArgument;
- if (obj)
- obj->release();
- }
- }
- if (kIOReturnSuccess != res)
- break;
- }
-
- crossEndian = (ndr.int_rep != NDR_record.int_rep);
- if (crossEndian)
- {
- if (!propertiesDict)
- propertiesDict = OSDictionary::withCapacity(4);
- OSData * data = OSData::withBytes(&ndr, sizeof(ndr));
- if (data)
- {
- if (propertiesDict)
- propertiesDict->setObject(kIOUserClientCrossEndianKey, data);
- data->release();
- }
- }
-
- res = service->newUserClient( owningTask, (void *) owningTask,
- connect_type, propertiesDict, &client );
-
- if (propertiesDict)
- propertiesDict->release();
-
- if (res == kIOReturnSuccess)
- {
- assert( OSDynamicCast(IOUserClient, client) );
-
- disallowAccess = (crossEndian
- && (kOSBooleanTrue != service->getProperty(kIOUserClientCrossEndianCompatibleKey))
- && (kOSBooleanTrue != client->getProperty(kIOUserClientCrossEndianCompatibleKey)));
- if (disallowAccess) res = kIOReturnUnsupported;
-#if CONFIG_MACF
- else if (0 != mac_iokit_check_open(kauth_cred_get(), client, connect_type))
- res = kIOReturnNotPermitted;
-#endif
- if (kIOReturnSuccess != res)
- {
- IOStatisticsClientCall();
- client->clientClose();
- client->release();
- client = 0;
- break;
- }
- client->sharedInstance = (0 != client->getProperty(kIOUserClientSharedInstanceKey));
- OSString * creatorName = IOCopyLogNameForPID(proc_selfpid());
- if (creatorName)
- {
- client->setProperty(kIOUserClientCreatorKey, creatorName);
- creatorName->release();
- }
- client->setTerminateDefer(service, false);
- }
+ err = service->newUserClient( owningTask, (void *) owningTask,
+ connect_type, &client );
+
+ if( err == kIOReturnSuccess) {
+ assert( OSDynamicCast(IOUserClient, client) );
+ *connection = client;
}
- while (false);
-
- *connection = client;
- *result = res;
-
- return (err);
+
+ return( err);
}
/* Routine io_service_close */
@@ -2631,7 +1979,6 @@
CHECK( IOUserClient, connection, client );
- IOStatisticsClientCall();
client->clientClose();
return( kIOReturnSuccess );
@@ -2658,62 +2005,45 @@
/* Routine io_connect_set_notification_port */
kern_return_t is_io_connect_set_notification_port(
io_object_t connection,
- uint32_t notification_type,
+ int notification_type,
mach_port_t port,
- uint32_t reference)
+ int reference)
{
CHECK( IOUserClient, connection, client );
- IOStatisticsClientCall();
- return( client->registerNotificationPort( port, notification_type,
- (io_user_reference_t) reference ));
-}
-
-/* Routine io_connect_set_notification_port */
-kern_return_t is_io_connect_set_notification_port_64(
- io_object_t connection,
- uint32_t notification_type,
- mach_port_t port,
- io_user_reference_t reference)
-{
- CHECK( IOUserClient, connection, client );
-
- IOStatisticsClientCall();
return( client->registerNotificationPort( port, notification_type,
reference ));
}
-/* Routine io_connect_map_memory_into_task */
-kern_return_t is_io_connect_map_memory_into_task
-(
- io_connect_t connection,
- uint32_t memory_type,
- task_t into_task,
- mach_vm_address_t *address,
- mach_vm_size_t *size,
- uint32_t flags
-)
+kern_return_t is_io_connect_map_memory(
+ io_object_t connect,
+ int type,
+ task_t task,
+ vm_address_t * mapAddr,
+ vm_size_t * mapSize,
+ int flags )
{
IOReturn err;
IOMemoryMap * map;
- CHECK( IOUserClient, connection, client );
-
- IOStatisticsClientCall();
- map = client->mapClientMemory64( memory_type, into_task, flags, *address );
+ CHECK( IOUserClient, connect, client );
+
+ map = client->mapClientMemory( type, task, flags, *mapAddr );
if( map) {
- *address = map->getAddress();
- if( size)
- *size = map->getSize();
-
- if( client->sharedInstance
- || (into_task != current_task())) {
+ *mapAddr = map->getVirtualAddress();
+ if( mapSize)
+ *mapSize = map->getLength();
+
+ if( task != current_task()) {
// push a name out to the task owning the map,
// so we can clean up maps
- mach_port_name_t name __unused =
- IOMachPort::makeSendRightForTask(
- into_task, map, IKOT_IOKIT_OBJECT );
+#if IOASSERT
+ mach_port_name_t name =
+#endif
+ IOMachPort::makeSendRightForTask(
+ task, map, IKOT_IOKIT_OBJECT );
+ assert( name );
} else {
// keep it with the user client
@@ -2732,32 +2062,6 @@
return( err );
}
-
-/* Routine is_io_connect_map_memory */
-kern_return_t is_io_connect_map_memory(
- io_object_t connect,
- uint32_t type,
- task_t task,
- vm_address_t * mapAddr,
- vm_size_t * mapSize,
- uint32_t flags )
-{
- IOReturn err;
- mach_vm_address_t address;
- mach_vm_size_t size;
-
- address = SCALAR64(*mapAddr);
- size = SCALAR64(*mapSize);
-
- err = is_io_connect_map_memory_into_task(connect, type, task, &address, &size, flags);
-
- *mapAddr = SCALAR32(address);
- *mapSize = SCALAR32(size);
-
- return (err);
-}
-
-} /* extern "C" */
IOMemoryMap * IOUserClient::removeMappingForDescriptor(IOMemoryDescriptor * mem)
{
@@ -2786,32 +2090,27 @@
return (map);
}
-extern "C" {
-
-/* Routine io_connect_unmap_memory_from_task */
-kern_return_t is_io_connect_unmap_memory_from_task
-(
- io_connect_t connection,
- uint32_t memory_type,
- task_t from_task,
- mach_vm_address_t address)
+kern_return_t is_io_connect_unmap_memory(
+ io_object_t connect,
+ int type,
+ task_t task,
+ vm_address_t mapAddr )
{
IOReturn err;
IOOptionBits options = 0;
IOMemoryDescriptor * memory;
IOMemoryMap * map;
- CHECK( IOUserClient, connection, client );
-
- IOStatisticsClientCall();
- err = client->clientMemoryForType( (UInt32) memory_type, &options, &memory );
+ CHECK( IOUserClient, connect, client );
+
+ err = client->clientMemoryForType( (UInt32) type, &options, &memory );
if( memory && (kIOReturnSuccess == err)) {
options = (options & ~kIOMapUserOptionsMask)
| kIOMapAnywhere | kIOMapReference;
- map = memory->createMappingInTask( from_task, address, options );
+ map = memory->map( task, mapAddr, options );
memory->release();
if( map)
{
@@ -2821,17 +2120,17 @@
IOLockUnlock( gIOObjectPortLock);
mach_port_name_t name = 0;
- if (from_task != current_task())
- name = IOMachPort::makeSendRightForTask( from_task, map, IKOT_IOKIT_OBJECT );
+ if (task != current_task())
+ name = IOMachPort::makeSendRightForTask( task, map, IKOT_IOKIT_OBJECT );
if (name)
{
- map->userClientUnmap();
- err = iokit_mod_send_right( from_task, name, -2 );
+ map->unmap();
+ err = iokit_mod_send_right( task, name, -2 );
err = kIOReturnSuccess;
}
else
IOMachPort::releasePortForObject( map, IKOT_IOKIT_OBJECT );
- if (from_task == current_task())
+ if (task == current_task())
map->release();
}
else
@@ -2841,22 +2140,6 @@
return( err );
}
-kern_return_t is_io_connect_unmap_memory(
- io_object_t connect,
- uint32_t type,
- task_t task,
- vm_address_t mapAddr )
-{
- IOReturn err;
- mach_vm_address_t address;
-
- address = SCALAR64(mapAddr);
-
- err = is_io_connect_unmap_memory_from_task(connect, type, task, mapAddr);
-
- return (err);
-}
-
/* Routine io_connect_add_client */
kern_return_t is_io_connect_add_client(
@@ -2866,7 +2149,6 @@
CHECK( IOUserClient, connection, client );
CHECK( IOUserClient, connect_to, to );
- IOStatisticsClientCall();
return( client->connectClient( to ) );
}
@@ -2876,687 +2158,136 @@
io_object_t connection,
io_buf_ptr_t properties,
mach_msg_type_number_t propertiesCnt,
- kern_return_t * result)
+ natural_t * result)
{
return( is_io_registry_entry_set_properties( connection, properties, propertiesCnt, result ));
}
-/* Routine io_user_client_method */
-kern_return_t is_io_connect_method_var_output
-(
- io_connect_t connection,
- uint32_t selector,
- io_scalar_inband64_t scalar_input,
- mach_msg_type_number_t scalar_inputCnt,
- io_struct_inband_t inband_input,
- mach_msg_type_number_t inband_inputCnt,
- mach_vm_address_t ool_input,
- mach_vm_size_t ool_input_size,
- io_struct_inband_t inband_output,
- mach_msg_type_number_t *inband_outputCnt,
- io_scalar_inband64_t scalar_output,
- mach_msg_type_number_t *scalar_outputCnt,
- io_buf_ptr_t *var_output,
- mach_msg_type_number_t *var_outputCnt
-)
-{
- CHECK( IOUserClient, connection, client );
-
- IOExternalMethodArguments args;
- IOReturn ret;
- IOMemoryDescriptor * inputMD = 0;
- OSObject * structureVariableOutputData = 0;
-
- bzero(&args.__reserved[0], sizeof(args.__reserved));
- args.version = kIOExternalMethodArgumentsCurrentVersion;
-
- args.selector = selector;
-
- args.asyncWakePort = MACH_PORT_NULL;
- args.asyncReference = 0;
- args.asyncReferenceCount = 0;
- args.structureVariableOutputData = &structureVariableOutputData;
-
- args.scalarInput = scalar_input;
- args.scalarInputCount = scalar_inputCnt;
- args.structureInput = inband_input;
- args.structureInputSize = inband_inputCnt;
-
- if (ool_input)
- inputMD = IOMemoryDescriptor::withAddressRange(ool_input, ool_input_size,
- kIODirectionOut, current_task());
-
- args.structureInputDescriptor = inputMD;
-
- args.scalarOutput = scalar_output;
- args.scalarOutputCount = *scalar_outputCnt;
- args.structureOutput = inband_output;
- args.structureOutputSize = *inband_outputCnt;
- args.structureOutputDescriptor = NULL;
- args.structureOutputDescriptorSize = 0;
-
- IOStatisticsClientCall();
- ret = client->externalMethod( selector, &args );
-
- *scalar_outputCnt = args.scalarOutputCount;
- *inband_outputCnt = args.structureOutputSize;
-
- if (var_outputCnt && var_output && (kIOReturnSuccess == ret))
- {
- OSSerialize * serialize;
- OSData * data;
- vm_size_t len;
-
- if ((serialize = OSDynamicCast(OSSerialize, structureVariableOutputData)))
- {
- len = serialize->getLength();
- *var_outputCnt = len;
- ret = copyoutkdata(serialize->text(), len, var_output);
- }
- else if ((data = OSDynamicCast(OSData, structureVariableOutputData)))
- {
- len = data->getLength();
- *var_outputCnt = len;
- ret = copyoutkdata(data->getBytesNoCopy(), len, var_output);
- }
- else
- {
- ret = kIOReturnUnderrun;
- }
- }
-
- if (inputMD)
- inputMD->release();
- if (structureVariableOutputData)
- structureVariableOutputData->release();
-
- return (ret);
-}
-
-/* Routine io_user_client_method */
-kern_return_t is_io_connect_method
-(
- io_connect_t connection,
- uint32_t selector,
- io_scalar_inband64_t scalar_input,
- mach_msg_type_number_t scalar_inputCnt,
- io_struct_inband_t inband_input,
- mach_msg_type_number_t inband_inputCnt,
- mach_vm_address_t ool_input,
- mach_vm_size_t ool_input_size,
- io_struct_inband_t inband_output,
- mach_msg_type_number_t *inband_outputCnt,
- io_scalar_inband64_t scalar_output,
- mach_msg_type_number_t *scalar_outputCnt,
- mach_vm_address_t ool_output,
- mach_vm_size_t *ool_output_size
-)
-{
- CHECK( IOUserClient, connection, client );
-
- IOExternalMethodArguments args;
- IOReturn ret;
- IOMemoryDescriptor * inputMD = 0;
- IOMemoryDescriptor * outputMD = 0;
-
- bzero(&args.__reserved[0], sizeof(args.__reserved));
- args.version = kIOExternalMethodArgumentsCurrentVersion;
-
- args.selector = selector;
-
- args.asyncWakePort = MACH_PORT_NULL;
- args.asyncReference = 0;
- args.asyncReferenceCount = 0;
- args.structureVariableOutputData = 0;
-
- args.scalarInput = scalar_input;
- args.scalarInputCount = scalar_inputCnt;
- args.structureInput = inband_input;
- args.structureInputSize = inband_inputCnt;
-
- if (ool_input)
- inputMD = IOMemoryDescriptor::withAddressRange(ool_input, ool_input_size,
- kIODirectionOut, current_task());
-
- args.structureInputDescriptor = inputMD;
-
- args.scalarOutput = scalar_output;
- args.scalarOutputCount = *scalar_outputCnt;
- args.structureOutput = inband_output;
- args.structureOutputSize = *inband_outputCnt;
-
- if (ool_output && ool_output_size)
- {
- outputMD = IOMemoryDescriptor::withAddressRange(ool_output, *ool_output_size,
- kIODirectionIn, current_task());
- }
-
- args.structureOutputDescriptor = outputMD;
- args.structureOutputDescriptorSize = ool_output_size ? *ool_output_size : 0;
-
- IOStatisticsClientCall();
- ret = client->externalMethod( selector, &args );
-
- *scalar_outputCnt = args.scalarOutputCount;
- *inband_outputCnt = args.structureOutputSize;
- *ool_output_size = args.structureOutputDescriptorSize;
-
- if (inputMD)
- inputMD->release();
- if (outputMD)
- outputMD->release();
-
- return (ret);
-}
-
-/* Routine io_async_user_client_method */
-kern_return_t is_io_connect_async_method
-(
- io_connect_t connection,
- mach_port_t wake_port,
- io_async_ref64_t reference,
- mach_msg_type_number_t referenceCnt,
- uint32_t selector,
- io_scalar_inband64_t scalar_input,
- mach_msg_type_number_t scalar_inputCnt,
- io_struct_inband_t inband_input,
- mach_msg_type_number_t inband_inputCnt,
- mach_vm_address_t ool_input,
- mach_vm_size_t ool_input_size,
- io_struct_inband_t inband_output,
- mach_msg_type_number_t *inband_outputCnt,
- io_scalar_inband64_t scalar_output,
- mach_msg_type_number_t *scalar_outputCnt,
- mach_vm_address_t ool_output,
- mach_vm_size_t * ool_output_size
-)
-{
- CHECK( IOUserClient, connection, client );
-
- IOExternalMethodArguments args;
- IOReturn ret;
- IOMemoryDescriptor * inputMD = 0;
- IOMemoryDescriptor * outputMD = 0;
-
- bzero(&args.__reserved[0], sizeof(args.__reserved));
- args.version = kIOExternalMethodArgumentsCurrentVersion;
-
- reference[0] = (io_user_reference_t) wake_port;
- if (vm_map_is_64bit(get_task_map(current_task())))
- reference[0] |= kIOUCAsync64Flag;
-
- args.selector = selector;
-
- args.asyncWakePort = wake_port;
- args.asyncReference = reference;
- args.asyncReferenceCount = referenceCnt;
-
- args.scalarInput = scalar_input;
- args.scalarInputCount = scalar_inputCnt;
- args.structureInput = inband_input;
- args.structureInputSize = inband_inputCnt;
-
- if (ool_input)
- inputMD = IOMemoryDescriptor::withAddressRange(ool_input, ool_input_size,
- kIODirectionOut, current_task());
-
- args.structureInputDescriptor = inputMD;
-
- args.scalarOutput = scalar_output;
- args.scalarOutputCount = *scalar_outputCnt;
- args.structureOutput = inband_output;
- args.structureOutputSize = *inband_outputCnt;
-
- if (ool_output)
- {
- outputMD = IOMemoryDescriptor::withAddressRange(ool_output, *ool_output_size,
- kIODirectionIn, current_task());
- }
-
- args.structureOutputDescriptor = outputMD;
- args.structureOutputDescriptorSize = *ool_output_size;
-
- IOStatisticsClientCall();
- ret = client->externalMethod( selector, &args );
-
- *inband_outputCnt = args.structureOutputSize;
- *ool_output_size = args.structureOutputDescriptorSize;
-
- if (inputMD)
- inputMD->release();
- if (outputMD)
- outputMD->release();
-
- return (ret);
-}
/* Routine io_connect_method_scalarI_scalarO */
kern_return_t is_io_connect_method_scalarI_scalarO(
- io_object_t connect,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_scalar_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- IOReturn err;
- uint32_t i;
- io_scalar_inband64_t _input;
- io_scalar_inband64_t _output;
-
- mach_msg_type_number_t struct_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- err = is_io_connect_method(connect, index,
- _input, inputCount,
- NULL, 0,
- 0, 0,
- NULL, &struct_outputCnt,
- _output, outputCount,
- 0, &ool_output_size);
-
- for (i = 0; i < *outputCount; i++)
- output[i] = SCALAR32(_output[i]);
-
- return (err);
-}
-
-kern_return_t shim_io_connect_method_scalarI_scalarO(
- IOExternalMethod * method,
- IOService * object,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_user_scalar_t * output,
- mach_msg_type_number_t * outputCount )
-{
+ io_object_t connect,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ void * output[],
+ IOByteCount * outputCount )
+{
+ IOReturn err;
+ IOExternalMethod * method;
+ IOService * object;
IOMethod func;
- io_scalar_inband_t _output;
- IOReturn err;
- err = kIOReturnBadArgument;
-
- do {
-
+
+ CHECK( IOUserClient, connect, client);
+ if( (method = client->getTargetAndMethodForIndex(&object, index))) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIScalarO != (method->flags & kIOUCTypeMask))
+ continue;
if( inputCount != method->count0)
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
continue;
- }
if( *outputCount != method->count1)
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
continue;
- }
func = method->func;
switch( inputCount) {
case 6:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]), ARG32(input[5]) );
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3], input[4], input[5] );
break;
case 5:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
- &_output[0] );
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3], input[4],
+ &output[0] );
break;
case 4:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]),
- &_output[0], &_output[1] );
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3],
+ &output[0], &output[1] );
break;
case 3:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- &_output[0], &_output[1], &_output[2] );
+ err = (object->*func)( input[0], input[1], input[2],
+ &output[0], &output[1], &output[2] );
break;
case 2:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]),
- &_output[0], &_output[1], &_output[2],
- &_output[3] );
+ err = (object->*func)( input[0], input[1],
+ &output[0], &output[1], &output[2],
+ &output[3] );
break;
case 1:
- err = (object->*func)( ARG32(input[0]),
- &_output[0], &_output[1], &_output[2],
- &_output[3], &_output[4] );
+ err = (object->*func)( input[0],
+ &output[0], &output[1], &output[2],
+ &output[3], &output[4] );
break;
case 0:
- err = (object->*func)( &_output[0], &_output[1], &_output[2],
- &_output[3], &_output[4], &_output[5] );
+ err = (object->*func)( &output[0], &output[1], &output[2],
+ &output[3], &output[4], &output[5] );
break;
default:
- IOLog("%s: Bad method table\n", object->getName());
+ IOLog("%s: Bad method table\n", client->getName());
}
- }
- while( false);
-
- uint32_t i;
- for (i = 0; i < *outputCount; i++)
- output[i] = SCALAR32(_output[i]);
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
return( err);
}
-
-/* Routine io_async_method_scalarI_scalarO */
-kern_return_t is_io_async_method_scalarI_scalarO(
- io_object_t connect,
- mach_port_t wake_port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_scalar_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- IOReturn err;
- uint32_t i;
- io_scalar_inband64_t _input;
- io_scalar_inband64_t _output;
- io_async_ref64_t _reference;
-
- for (i = 0; i < referenceCnt; i++)
- _reference[i] = REF64(reference[i]);
-
- mach_msg_type_number_t struct_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- err = is_io_connect_async_method(connect,
- wake_port, _reference, referenceCnt,
- index,
- _input, inputCount,
- NULL, 0,
- 0, 0,
- NULL, &struct_outputCnt,
- _output, outputCount,
- 0, &ool_output_size);
-
- for (i = 0; i < *outputCount; i++)
- output[i] = SCALAR32(_output[i]);
-
- return (err);
-}
-/* Routine io_async_method_scalarI_structureO */
-kern_return_t is_io_async_method_scalarI_structureO(
- io_object_t connect,
- mach_port_t wake_port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- uint32_t i;
- io_scalar_inband64_t _input;
- io_async_ref64_t _reference;
-
- for (i = 0; i < referenceCnt; i++)
- _reference[i] = REF64(reference[i]);
-
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- return (is_io_connect_async_method(connect,
- wake_port, _reference, referenceCnt,
- index,
- _input, inputCount,
- NULL, 0,
- 0, 0,
- output, outputCount,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-/* Routine io_async_method_scalarI_structureI */
-kern_return_t is_io_async_method_scalarI_structureI(
- io_connect_t connect,
- mach_port_t wake_port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t inputStruct,
- mach_msg_type_number_t inputStructCount )
-{
- uint32_t i;
- io_scalar_inband64_t _input;
- io_async_ref64_t _reference;
-
- for (i = 0; i < referenceCnt; i++)
- _reference[i] = REF64(reference[i]);
-
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_msg_type_number_t inband_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- return (is_io_connect_async_method(connect,
- wake_port, _reference, referenceCnt,
- index,
- _input, inputCount,
- inputStruct, inputStructCount,
- 0, 0,
- NULL, &inband_outputCnt,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-/* Routine io_async_method_structureI_structureO */
-kern_return_t is_io_async_method_structureI_structureO(
- io_object_t connect,
- mach_port_t wake_port,
- io_async_ref_t reference,
- mach_msg_type_number_t referenceCnt,
- uint32_t index,
- io_struct_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- uint32_t i;
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
- io_async_ref64_t _reference;
-
- for (i = 0; i < referenceCnt; i++)
- _reference[i] = REF64(reference[i]);
-
- return (is_io_connect_async_method(connect,
- wake_port, _reference, referenceCnt,
- index,
- NULL, 0,
- input, inputCount,
- 0, 0,
- output, outputCount,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-
-kern_return_t shim_io_async_method_scalarI_scalarO(
- IOExternalAsyncMethod * method,
- IOService * object,
- mach_port_t asyncWakePort,
- io_user_reference_t * asyncReference,
- uint32_t asyncReferenceCount,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_user_scalar_t * output,
- mach_msg_type_number_t * outputCount )
-{
- IOAsyncMethod func;
- uint32_t i;
- io_scalar_inband_t _output;
- IOReturn err;
- io_async_ref_t reference;
-
- for (i = 0; i < asyncReferenceCount; i++)
- reference[i] = REF32(asyncReference[i]);
-
- err = kIOReturnBadArgument;
-
- do {
-
- if( inputCount != method->count0)
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( *outputCount != method->count1)
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
- func = method->func;
-
- switch( inputCount) {
-
- case 6:
- err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]), ARG32(input[5]) );
- break;
- case 5:
- err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
- &_output[0] );
- break;
- case 4:
- err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]),
- &_output[0], &_output[1] );
- break;
- case 3:
- err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- &_output[0], &_output[1], &_output[2] );
- break;
- case 2:
- err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]),
- &_output[0], &_output[1], &_output[2],
- &_output[3] );
- break;
- case 1:
- err = (object->*func)( reference,
- ARG32(input[0]),
- &_output[0], &_output[1], &_output[2],
- &_output[3], &_output[4] );
- break;
- case 0:
- err = (object->*func)( reference,
- &_output[0], &_output[1], &_output[2],
- &_output[3], &_output[4], &_output[5] );
- break;
-
- default:
- IOLog("%s: Bad method table\n", object->getName());
- }
- }
- while( false);
-
- for (i = 0; i < *outputCount; i++)
- output[i] = SCALAR32(_output[i]);
-
- return( err);
-}
-
/* Routine io_connect_method_scalarI_structureO */
kern_return_t is_io_connect_method_scalarI_structureO(
io_object_t connect,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- uint32_t i;
- io_scalar_inband64_t _input;
-
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- return (is_io_connect_method(connect, index,
- _input, inputCount,
- NULL, 0,
- 0, 0,
- output, outputCount,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-kern_return_t shim_io_connect_method_scalarI_structureO(
-
- IOExternalMethod * method,
- IOService * object,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ void * output,
IOByteCount * outputCount )
{
+ IOReturn err;
+ IOExternalMethod * method;
+ IOService * object;
IOMethod func;
- IOReturn err;
-
- err = kIOReturnBadArgument;
-
- do {
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIStructO != (method->flags & kIOUCTypeMask))
+ continue;
if( inputCount != method->count0)
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
+ if( (0xffffffff != method->count1)
&& (*outputCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
continue;
- }
func = method->func;
switch( inputCount) {
case 5:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3], input[4],
output );
break;
case 4:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]),
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3],
output, (void *)outputCount );
break;
case 3:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
+ err = (object->*func)( input[0], input[1], input[2],
output, (void *)outputCount, 0 );
break;
case 2:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]),
+ err = (object->*func)( input[0], input[1],
output, (void *)outputCount, 0, 0 );
break;
case 1:
- err = (object->*func)( ARG32(input[0]),
+ err = (object->*func)( input[0],
output, (void *)outputCount, 0, 0, 0 );
break;
case 0:
@@ -3564,77 +2295,280 @@
break;
default:
- IOLog("%s: Bad method table\n", object->getName());
+ IOLog("%s: Bad method table\n", client->getName());
}
- }
- while( false);
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
return( err);
}
-
-kern_return_t shim_io_async_method_scalarI_structureO(
- IOExternalAsyncMethod * method,
- IOService * object,
- mach_port_t asyncWakePort,
- io_user_reference_t * asyncReference,
- uint32_t asyncReferenceCount,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
+/* Routine io_connect_method_scalarI_structureI */
+kern_return_t is_io_connect_method_scalarI_structureI(
+ io_connect_t connect,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ UInt8 * inputStruct,
+ IOByteCount inputStructCount )
+{
+ IOReturn err;
+ IOExternalMethod * method;
+ IOService * object;
+ IOMethod func;
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIStructI != (method->flags & kIOUCTypeMask))
+ continue;
+ if( (0xffffffff != method->count0)
+ && (inputCount != method->count0))
+ continue;
+ if( (0xffffffff != method->count1)
+ && (inputStructCount != method->count1))
+ continue;
+
+ func = method->func;
+
+ switch( inputCount) {
+
+ case 5:
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3], input[4],
+ inputStruct );
+ break;
+ case 4:
+ err = (object->*func)( input[0], input[1], input[2],
+ input[3],
+ inputStruct, (void *)inputStructCount );
+ break;
+ case 3:
+ err = (object->*func)( input[0], input[1], input[2],
+ inputStruct, (void *)inputStructCount,
+ 0 );
+ break;
+ case 2:
+ err = (object->*func)( input[0], input[1],
+ inputStruct, (void *)inputStructCount,
+ 0, 0 );
+ break;
+ case 1:
+ err = (object->*func)( input[0],
+ inputStruct, (void *)inputStructCount,
+ 0, 0, 0 );
+ break;
+ case 0:
+ err = (object->*func)( inputStruct, (void *)inputStructCount,
+ 0, 0, 0, 0 );
+ break;
+
+ default:
+ IOLog("%s: Bad method table\n", client->getName());
+ }
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
+
+ return( err);
+}
+
+/* Routine io_connect_method_structureI_structureO */
+kern_return_t is_io_connect_method_structureI_structureO(
+ io_object_t connect,
+ UInt32 index,
+ UInt8 * input,
+ IOByteCount inputCount,
+ UInt8 * output,
+ IOByteCount * outputCount )
+{
+ IOReturn err;
+ IOExternalMethod * method;
+ IOService * object;
+ IOMethod func;
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCStructIStructO != (method->flags & kIOUCTypeMask))
+ continue;
+ if( (0xffffffff != method->count0)
+ && (inputCount != method->count0))
+ continue;
+ if( (0xffffffff != method->count1)
+ && (*outputCount != method->count1))
+ continue;
+
+ func = method->func;
+
+ if( method->count1) {
+ if( method->count0) {
+ err = (object->*func)( input, output,
+ (void *)inputCount, outputCount, 0, 0 );
+ } else {
+ err = (object->*func)( output, outputCount, 0, 0, 0, 0 );
+ }
+ } else {
+ err = (object->*func)( input, (void *)inputCount, 0, 0, 0, 0 );
+ }
+
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
+
+ return( err);
+}
+
+kern_return_t is_io_async_method_scalarI_scalarO(
+ io_object_t connect,
+ mach_port_t wakePort,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ void * output[],
+ IOByteCount * outputCount )
+{
+ IOReturn err;
+ IOExternalAsyncMethod *method;
+ IOService * object;
IOAsyncMethod func;
- uint32_t i;
+
+ CHECK( IOUserClient, connect, client);
+ if( (method = client->getAsyncTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIScalarO != (method->flags & kIOUCTypeMask))
+ continue;
+ if( inputCount != method->count0)
+ continue;
+ if( *outputCount != method->count1)
+ continue;
+
+ reference[0] = (natural_t) wakePort;
+ func = method->func;
+
+ switch( inputCount) {
+
+ case 6:
+ err = (object->*func)( reference,
+ input[0], input[1], input[2],
+ input[3], input[4], input[5] );
+ break;
+ case 5:
+ err = (object->*func)( reference,
+ input[0], input[1], input[2],
+ input[3], input[4],
+ &output[0] );
+ break;
+ case 4:
+ err = (object->*func)( reference,
+ input[0], input[1], input[2],
+ input[3],
+ &output[0], &output[1] );
+ break;
+ case 3:
+ err = (object->*func)( reference,
+ input[0], input[1], input[2],
+ &output[0], &output[1], &output[2] );
+ break;
+ case 2:
+ err = (object->*func)( reference,
+ input[0], input[1],
+ &output[0], &output[1], &output[2],
+ &output[3] );
+ break;
+ case 1:
+ err = (object->*func)( reference,
+ input[0],
+ &output[0], &output[1], &output[2],
+ &output[3], &output[4] );
+ break;
+ case 0:
+ err = (object->*func)( reference,
+ &output[0], &output[1], &output[2],
+ &output[3], &output[4], &output[5] );
+ break;
+
+ default:
+ IOLog("%s: Bad method table\n", client->getName());
+ }
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
+
+ return( err);
+}
+
+kern_return_t is_io_async_method_scalarI_structureO(
+ io_object_t connect,
+ mach_port_t wakePort,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ void * output,
+ IOByteCount * outputCount )
+{
IOReturn err;
- io_async_ref_t reference;
-
- for (i = 0; i < asyncReferenceCount; i++)
- reference[i] = REF32(asyncReference[i]);
-
- err = kIOReturnBadArgument;
- do {
- if( inputCount != method->count0)
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
- && (*outputCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
- func = method->func;
+ IOExternalAsyncMethod *method;
+ IOService * object;
+ IOAsyncMethod func;
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getAsyncTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIStructO != (method->flags & kIOUCTypeMask))
+ continue;
+ if( inputCount != method->count0)
+ continue;
+ if( (0xffffffff != method->count1)
+ && (*outputCount != method->count1))
+ continue;
+
+ reference[0] = (natural_t) wakePort;
+ func = method->func;
switch( inputCount) {
case 5:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
+ input[0], input[1], input[2],
+ input[3], input[4],
output );
break;
case 4:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]),
+ input[0], input[1], input[2],
+ input[3],
output, (void *)outputCount );
break;
case 3:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
+ input[0], input[1], input[2],
output, (void *)outputCount, 0 );
break;
case 2:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]),
+ input[0], input[1],
output, (void *)outputCount, 0, 0 );
break;
case 1:
err = (object->*func)( reference,
- ARG32(input[0]),
+ input[0],
output, (void *)outputCount, 0, 0, 0 );
break;
case 0:
@@ -3643,312 +2577,214 @@
break;
default:
- IOLog("%s: Bad method table\n", object->getName());
+ IOLog("%s: Bad method table\n", client->getName());
}
- }
- while( false);
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
return( err);
}
-/* Routine io_connect_method_scalarI_structureI */
-kern_return_t is_io_connect_method_scalarI_structureI(
- io_connect_t connect,
- uint32_t index,
- io_scalar_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t inputStruct,
- mach_msg_type_number_t inputStructCount )
-{
- uint32_t i;
- io_scalar_inband64_t _input;
-
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_msg_type_number_t inband_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- for (i = 0; i < inputCount; i++)
- _input[i] = SCALAR64(input[i]);
-
- return (is_io_connect_method(connect, index,
- _input, inputCount,
- inputStruct, inputStructCount,
- 0, 0,
- NULL, &inband_outputCnt,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-kern_return_t shim_io_connect_method_scalarI_structureI(
- IOExternalMethod * method,
- IOService * object,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t inputStruct,
- mach_msg_type_number_t inputStructCount )
-{
- IOMethod func;
- IOReturn err = kIOReturnBadArgument;
-
- do
- {
- if( (kIOUCVariableStructureSize != method->count0)
- && (inputCount != method->count0))
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
- && (inputStructCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
- func = method->func;
-
- switch( inputCount) {
-
- case 5:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
- inputStruct );
- break;
- case 4:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), (void *) input[2],
- ARG32(input[3]),
- inputStruct, (void *)(uintptr_t)inputStructCount );
- break;
- case 3:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
- 0 );
- break;
- case 2:
- err = (object->*func)( ARG32(input[0]), ARG32(input[1]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
- 0, 0 );
- break;
- case 1:
- err = (object->*func)( ARG32(input[0]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
- 0, 0, 0 );
- break;
- case 0:
- err = (object->*func)( inputStruct, (void *)(uintptr_t)inputStructCount,
- 0, 0, 0, 0 );
- break;
-
- default:
- IOLog("%s: Bad method table\n", object->getName());
- }
- }
- while (false);
-
- return( err);
-}
-
-kern_return_t shim_io_async_method_scalarI_structureI(
- IOExternalAsyncMethod * method,
- IOService * object,
- mach_port_t asyncWakePort,
- io_user_reference_t * asyncReference,
- uint32_t asyncReferenceCount,
- const io_user_scalar_t * input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t inputStruct,
- mach_msg_type_number_t inputStructCount )
-{
+kern_return_t is_io_async_method_scalarI_structureI(
+ io_connect_t connect,
+ mach_port_t wakePort,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
+ UInt32 index,
+ void * input[],
+ IOByteCount inputCount,
+ UInt8 * inputStruct,
+ IOByteCount inputStructCount )
+{
+ IOReturn err;
+ IOExternalAsyncMethod *method;
+ IOService * object;
IOAsyncMethod func;
- uint32_t i;
- IOReturn err = kIOReturnBadArgument;
- io_async_ref_t reference;
-
- for (i = 0; i < asyncReferenceCount; i++)
- reference[i] = REF32(asyncReference[i]);
-
- do
- {
- if( (kIOUCVariableStructureSize != method->count0)
- && (inputCount != method->count0))
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
- && (inputStructCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getAsyncTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCScalarIStructI != (method->flags & kIOUCTypeMask))
+ continue;
+ if( (0xffffffff != method->count0)
+ && (inputCount != method->count0))
+ continue;
+ if( (0xffffffff != method->count1)
+ && (inputStructCount != method->count1))
+ continue;
+
+ reference[0] = (natural_t) wakePort;
func = method->func;
switch( inputCount) {
case 5:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]), ARG32(input[4]),
+ input[0], input[1], input[2],
+ input[3], input[4],
inputStruct );
break;
case 4:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- ARG32(input[3]),
- inputStruct, (void *)(uintptr_t)inputStructCount );
+ input[0], input[1], input[2],
+ input[3],
+ inputStruct, (void *)inputStructCount );
break;
case 3:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]), ARG32(input[2]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
+ input[0], input[1], input[2],
+ inputStruct, (void *)inputStructCount,
0 );
break;
case 2:
err = (object->*func)( reference,
- ARG32(input[0]), ARG32(input[1]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
+ input[0], input[1],
+ inputStruct, (void *)inputStructCount,
0, 0 );
break;
case 1:
err = (object->*func)( reference,
- ARG32(input[0]),
- inputStruct, (void *)(uintptr_t)inputStructCount,
+ input[0],
+ inputStruct, (void *)inputStructCount,
0, 0, 0 );
break;
case 0:
err = (object->*func)( reference,
- inputStruct, (void *)(uintptr_t)inputStructCount,
+ inputStruct, (void *)inputStructCount,
0, 0, 0, 0 );
break;
default:
- IOLog("%s: Bad method table\n", object->getName());
+ IOLog("%s: Bad method table\n", client->getName());
}
- }
- while (false);
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
return( err);
}
-/* Routine io_connect_method_structureI_structureO */
-kern_return_t is_io_connect_method_structureI_structureO(
- io_object_t connect,
- uint32_t index,
- io_struct_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
- mach_msg_type_number_t scalar_outputCnt = 0;
- mach_vm_size_t ool_output_size = 0;
-
- return (is_io_connect_method(connect, index,
- NULL, 0,
- input, inputCount,
- 0, 0,
- output, outputCount,
- NULL, &scalar_outputCnt,
- 0, &ool_output_size));
-}
-
-kern_return_t shim_io_connect_method_structureI_structureO(
- IOExternalMethod * method,
- IOService * object,
- io_struct_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
+kern_return_t is_io_async_method_structureI_structureO(
+ io_object_t connect,
+ mach_port_t wakePort,
+ io_async_ref_t reference,
+ mach_msg_type_number_t referenceCnt,
+ UInt32 index,
+ UInt8 * input,
+ IOByteCount inputCount,
+ UInt8 * output,
IOByteCount * outputCount )
{
- IOMethod func;
- IOReturn err = kIOReturnBadArgument;
-
- do
- {
- if( (kIOUCVariableStructureSize != method->count0)
- && (inputCount != method->count0))
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
- && (*outputCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
- func = method->func;
-
- if( method->count1) {
- if( method->count0) {
- err = (object->*func)( input, output,
- (void *)(uintptr_t)inputCount, outputCount, 0, 0 );
- } else {
- err = (object->*func)( output, outputCount, 0, 0, 0, 0 );
- }
- } else {
- err = (object->*func)( input, (void *)(uintptr_t)inputCount, 0, 0, 0, 0 );
- }
- }
- while( false);
-
-
- return( err);
-}
-
-kern_return_t shim_io_async_method_structureI_structureO(
- IOExternalAsyncMethod * method,
- IOService * object,
- mach_port_t asyncWakePort,
- io_user_reference_t * asyncReference,
- uint32_t asyncReferenceCount,
- io_struct_inband_t input,
- mach_msg_type_number_t inputCount,
- io_struct_inband_t output,
- mach_msg_type_number_t * outputCount )
-{
+ IOReturn err;
+ IOExternalAsyncMethod *method;
+ IOService * object;
IOAsyncMethod func;
- uint32_t i;
- IOReturn err;
- io_async_ref_t reference;
-
- for (i = 0; i < asyncReferenceCount; i++)
- reference[i] = REF32(asyncReference[i]);
-
- err = kIOReturnBadArgument;
- do
- {
- if( (kIOUCVariableStructureSize != method->count0)
- && (inputCount != method->count0))
- {
- IOLog("%s: IOUserClient inputCount count mismatch\n", object->getName());
- continue;
- }
- if( (kIOUCVariableStructureSize != method->count1)
- && (*outputCount != method->count1))
- {
- IOLog("%s: IOUserClient outputCount count mismatch\n", object->getName());
- continue;
- }
-
+
+ CHECK( IOUserClient, connect, client);
+
+ if( (method = client->getAsyncTargetAndMethodForIndex(&object, index)) ) {
+ do {
+ err = kIOReturnBadArgument;
+ if( kIOUCStructIStructO != (method->flags & kIOUCTypeMask))
+ continue;
+ if( (0xffffffff != method->count0)
+ && (inputCount != method->count0))
+ continue;
+ if( (0xffffffff != method->count1)
+ && (*outputCount != method->count1))
+ continue;
+
+ reference[0] = (natural_t) wakePort;
func = method->func;
if( method->count1) {
if( method->count0) {
err = (object->*func)( reference,
input, output,
- (void *)(uintptr_t)inputCount, outputCount, 0, 0 );
+ (void *)inputCount, outputCount, 0, 0 );
} else {
err = (object->*func)( reference,
output, outputCount, 0, 0, 0, 0 );
}
} else {
err = (object->*func)( reference,
- input, (void *)(uintptr_t)inputCount, 0, 0, 0, 0 );
+ input, (void *)inputCount, 0, 0, 0, 0 );
}
+
+ } while( false);
+
+ } else
+ err = kIOReturnUnsupported;
+
+ return( err);
+}
+/* Routine io_make_matching */
+kern_return_t is_io_make_matching(
+ mach_port_t master_port,
+ UInt32 type,
+ IOOptionBits options,
+ UInt8 * input,
+ IOByteCount inputCount,
+ io_string_t matching )
+{
+ OSSerialize * s;
+ IOReturn err = kIOReturnSuccess;
+ OSDictionary * dict;
+
+ if( master_port != master_device_port)
+ return( kIOReturnNotPrivileged);
+
+ switch( type) {
+
+ case kIOServiceMatching:
+ dict = IOService::serviceMatching( gIOServiceKey );
+ break;
+
+ case kIOBSDNameMatching:
+ dict = IOBSDNameMatching( (const char *) input );
+ break;
+
+ case kIOOFPathMatching:
+ dict = IOOFPathMatching( (const char *) input,
+ matching, sizeof( io_string_t));
+ break;
+
+ default:
+ dict = 0;
}
- while( false);
+
+ if( !dict)
+ return( kIOReturnUnsupported);
+
+ do {
+ s = OSSerialize::withCapacity(4096);
+ if( !s) {
+ err = kIOReturnNoMemory;
+ continue;
+ }
+ s->clearText();
+ if( !dict->serialize( s )) {
+ err = kIOReturnUnsupported;
+ continue;
+ }
+
+ if( s->getLength() > sizeof( io_string_t)) {
+ err = kIOReturnNoMemory;
+ continue;
+ } else
+ strcpy( matching, s->text());
+
+ } while( false);
+
+ if( s)
+ s->release();
+ if( dict)
+ dict->release();
return( err);
}
@@ -3956,10 +2792,10 @@
/* Routine io_catalog_send_data */
kern_return_t is_io_catalog_send_data(
mach_port_t master_port,
- uint32_t flag,
+ int flag,
io_buf_ptr_t inData,
mach_msg_type_number_t inDataCount,
- kern_return_t * result)
+ natural_t * result)
{
OSObject * obj = 0;
vm_offset_t data;
@@ -3970,22 +2806,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 && ( !inData || !inDataCount) )
return kIOReturnBadArgument;
- }
if (inData) {
vm_map_offset_t map_data;
- if( inDataCount > sizeof(io_struct_inband_t) * 1024)
- return( kIOReturnMessageTooLarge);
-
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;
@@ -3993,7 +2822,7 @@
// must return success after vm_map_copyout() succeeds
if( inDataCount ) {
- obj = (OSObject *)OSUnserializeXML((const char *)data, inDataCount);
+ obj = (OSObject *)OSUnserializeXML((const char *)data);
vm_deallocate( kernel_map, data, inDataCount );
if( !obj) {
*result = kIOReturnNoMemory;
@@ -4003,23 +2832,6 @@
}
switch ( flag ) {
- case kIOCatalogResetDrivers:
- case kIOCatalogResetDriversNoMatch: {
- OSArray * array;
-
- array = OSDynamicCast(OSArray, obj);
- if (array) {
- if ( !gIOCatalogue->resetAndAddDrivers(array,
- flag == kIOCatalogResetDrivers) ) {
-
- kr = kIOReturnError;
- }
- } else {
- kr = kIOReturnBadArgument;
- }
- }
- break;
-
case kIOCatalogAddDrivers:
case kIOCatalogAddDriversNoMatch: {
OSArray * array;
@@ -4069,37 +2881,12 @@
}
break;
- case kIOCatalogRemoveKernelLinker:
- kr = KERN_NOT_SUPPORTED;
- break;
-
- case kIOCatalogKextdActive:
-#if !NO_KEXTD
- IOServiceTrace(IOSERVICE_KEXTD_ALIVE, 0, 0, 0, 0);
- OSKext::setKextdActive();
-
- /* Dump all nonloaded startup extensions; kextd will now send them
- * down on request.
- */
- OSKext::flushNonloadedKexts( /* flushPrelinkedKexts */ false);
-#endif
- kr = kIOReturnSuccess;
- break;
-
- case kIOCatalogKextdFinishedLaunching: {
-#if !NO_KEXTD
- static bool clearedBusy = false;
-
- if (!clearedBusy) {
- IOService * serviceRoot = IOService::getServiceRoot();
- if (serviceRoot) {
- IOServiceTrace(IOSERVICE_KEXTD_READY, 0, 0, 0, 0);
- serviceRoot->adjustBusy(-1);
- clearedBusy = true;
- }
+ case kIOCatalogRemoveKernelLinker: {
+ if (gIOCatalogue->removeKernelLinker() != KERN_SUCCESS) {
+ kr = kIOReturnError;
+ } else {
+ kr = kIOReturnSuccess;
}
-#endif
- kr = kIOReturnSuccess;
}
break;
@@ -4117,7 +2904,7 @@
/* Routine io_catalog_terminate */
kern_return_t is_io_catalog_terminate(
mach_port_t master_port,
- uint32_t flag,
+ int flag,
io_name_t name )
{
kern_return_t kr;
@@ -4131,7 +2918,6 @@
return( kr );
switch ( flag ) {
-#if !defined(SECURE_KERNEL)
case kIOCatalogServiceTerminate:
OSIterator * iter;
IOService * service;
@@ -4161,7 +2947,6 @@
kr = gIOCatalogue->terminateDriversForModule(name,
flag == kIOCatalogModuleUnload);
break;
-#endif
default:
kr = kIOReturnBadArgument;
@@ -4174,7 +2959,7 @@
/* Routine io_catalog_get_data */
kern_return_t is_io_catalog_get_data(
mach_port_t master_port,
- uint32_t flag,
+ int flag,
io_buf_ptr_t *outData,
mach_msg_type_number_t *outDataCount)
{
@@ -4218,7 +3003,7 @@
/* Routine io_catalog_get_gen_count */
kern_return_t is_io_catalog_get_gen_count(
mach_port_t master_port,
- uint32_t *genCount)
+ int *genCount)
{
if( master_port != master_device_port)
return kIOReturnNotPrivileged;
@@ -4233,9 +3018,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)
@@ -4255,7 +3038,7 @@
kern_return_t is_io_catalog_reset(
mach_port_t master_port,
- uint32_t flag)
+ int flag)
{
if( master_port != master_device_port)
return kIOReturnNotPrivileged;
@@ -4300,175 +3083,10 @@
return result;
}
-} /* extern "C" */
-
-IOReturn IOUserClient::externalMethod( uint32_t selector, IOExternalMethodArguments * args,
- IOExternalMethodDispatch * dispatch, OSObject * target, void * reference )
-{
- IOReturn err;
- IOService * object;
- IOByteCount structureOutputSize;
-
- if (dispatch)
- {
- uint32_t count;
- count = dispatch->checkScalarInputCount;
- if ((kIOUCVariableStructureSize != count) && (count != args->scalarInputCount))
- {
- return (kIOReturnBadArgument);
- }
-
- count = dispatch->checkStructureInputSize;
- if ((kIOUCVariableStructureSize != count)
- && (count != ((args->structureInputDescriptor)
- ? args->structureInputDescriptor->getLength() : args->structureInputSize)))
- {
- return (kIOReturnBadArgument);
- }
-
- count = dispatch->checkScalarOutputCount;
- if ((kIOUCVariableStructureSize != count) && (count != args->scalarOutputCount))
- {
- return (kIOReturnBadArgument);
- }
-
- count = dispatch->checkStructureOutputSize;
- if ((kIOUCVariableStructureSize != count)
- && (count != ((args->structureOutputDescriptor)
- ? args->structureOutputDescriptor->getLength() : args->structureOutputSize)))
- {
- return (kIOReturnBadArgument);
- }
-
- if (dispatch->function)
- err = (*dispatch->function)(target, reference, args);
- else
- err = kIOReturnNoCompletion; /* implementator can dispatch */
-
- return (err);
- }
-
-
- // pre-Leopard API's don't do ool structs
- if (args->structureInputDescriptor || args->structureOutputDescriptor)
- {
- err = kIOReturnIPCError;
- return (err);
- }
-
- structureOutputSize = args->structureOutputSize;
-
- if (args->asyncWakePort)
- {
- IOExternalAsyncMethod * method;
-
- if( !(method = getAsyncTargetAndMethodForIndex(&object, selector)) )
- return (kIOReturnUnsupported);
-
- if (kIOUCForegroundOnly & method->flags)
- {
- /* is graphics access denied for current task? */
- if (proc_get_effective_task_policy(current_task(), TASK_POLICY_GPU_DENY) != 0)
- return (kIOReturnNotPermitted);
- }
-
- switch (method->flags & kIOUCTypeMask)
- {
- case kIOUCScalarIStructI:
- err = shim_io_async_method_scalarI_structureI( method, object,
- args->asyncWakePort, args->asyncReference, args->asyncReferenceCount,
- args->scalarInput, args->scalarInputCount,
- (char *)args->structureInput, args->structureInputSize );
- break;
-
- case kIOUCScalarIScalarO:
- err = shim_io_async_method_scalarI_scalarO( method, object,
- args->asyncWakePort, args->asyncReference, args->asyncReferenceCount,
- args->scalarInput, args->scalarInputCount,
- args->scalarOutput, &args->scalarOutputCount );
- break;
-
- case kIOUCScalarIStructO:
- err = shim_io_async_method_scalarI_structureO( method, object,
- args->asyncWakePort, args->asyncReference, args->asyncReferenceCount,
- args->scalarInput, args->scalarInputCount,
- (char *) args->structureOutput, &args->structureOutputSize );
- break;
-
-
- case kIOUCStructIStructO:
- err = shim_io_async_method_structureI_structureO( method, object,
- args->asyncWakePort, args->asyncReference, args->asyncReferenceCount,
- (char *)args->structureInput, args->structureInputSize,
- (char *) args->structureOutput, &args->structureOutputSize );
- break;
-
- default:
- err = kIOReturnBadArgument;
- break;
- }
- }
- else
- {
- IOExternalMethod * method;
-
- if( !(method = getTargetAndMethodForIndex(&object, selector)) )
- return (kIOReturnUnsupported);
-
- if (kIOUCForegroundOnly & method->flags)
- {
- /* is graphics access denied for current task? */
- if (proc_get_effective_task_policy(current_task(), TASK_POLICY_GPU_DENY) != 0)
- 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 );
- break;
-
- case kIOUCScalarIScalarO:
- err = shim_io_connect_method_scalarI_scalarO( method, object,
- args->scalarInput, args->scalarInputCount,
- args->scalarOutput, &args->scalarOutputCount );
- break;
-
- case kIOUCScalarIStructO:
- err = shim_io_connect_method_scalarI_structureO( method, object,
- args->scalarInput, args->scalarInputCount,
- (char *) args->structureOutput, &structureOutputSize );
- break;
-
-
- case kIOUCStructIStructO:
- err = shim_io_connect_method_structureI_structureO( method, object,
- (char *) args->structureInput, args->structureInputSize,
- (char *) args->structureOutput, &structureOutputSize );
- break;
-
- default:
- err = kIOReturnBadArgument;
- break;
- }
- }
-
- args->structureOutputSize = structureOutputSize;
-
- return (err);
-}
-
-
-#if __LP64__
+}; /* extern "C" */
+
OSMetaClassDefineReservedUnused(IOUserClient, 0);
OSMetaClassDefineReservedUnused(IOUserClient, 1);
-#else
-OSMetaClassDefineReservedUsed(IOUserClient, 0);
-OSMetaClassDefineReservedUsed(IOUserClient, 1);
-#endif
OSMetaClassDefineReservedUnused(IOUserClient, 2);
OSMetaClassDefineReservedUnused(IOUserClient, 3);
OSMetaClassDefineReservedUnused(IOUserClient, 4);