X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/89b3af67bb32e691275bf6fa803d1834b2284115..e2fac8b15b12a7979f72090454d850e612fc5b13:/iokit/Kernel/IODeviceTreeSupport.cpp

diff --git a/iokit/Kernel/IODeviceTreeSupport.cpp b/iokit/Kernel/IODeviceTreeSupport.cpp
index efaf431e5..381022c56 100644
--- a/iokit/Kernel/IODeviceTreeSupport.cpp
+++ b/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -94,7 +94,7 @@ IODeviceTreeAlloc( void * dtTop )
     OSObject *			obj;
     OSDictionary *		allInts;
     vm_offset_t *		dtMap;
-    int				propSize;
+    unsigned int		propSize;
     bool			intMap;
     bool			freeDT;
 
@@ -144,7 +144,7 @@ IODeviceTreeAlloc( void * dtTop )
     freeDT = (kSuccess == DTLookupEntry( 0, "/chosen/memory-map", &mapEntry ))
 	  && (kSuccess == DTGetProperty( mapEntry,
                 "DeviceTree", (void **) &dtMap, &propSize ))
-	  && ((2 * sizeof( vm_offset_t)) == propSize);
+	  && ((2 * sizeof(vm_offset_t)) == propSize);
 
     parent = MakeReferenceTable( (DTEntry)dtTop, freeDT );
 
@@ -222,7 +222,7 @@ IODeviceTreeAlloc( void * dtTop )
             if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) {
 
                 if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey )))
-                  || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) {
+                  || (strncmp("display", (char *)prop->getBytesNoCopy(), sizeof("display"))) ) {
                     child->removeProperty( "driver,AAPL,MacOS,PowerPC");
                 }
             }
@@ -328,7 +328,7 @@ MakeReferenceTable( DTEntry dtEntry, bool copy )
     const OSSymbol		*sym;
     DTPropertyIterator	dtIter;
     void				*prop;
-    int					propSize;
+    unsigned int		propSize;
     char				*name;
     char				location[ 32 ];
     bool				noLocation = true;
@@ -373,17 +373,17 @@ MakeReferenceTable( DTEntry dtEntry, bool copy )
 
             } else if( nameKey == gIODTUnitKey ) {
                 // all OF strings are null terminated... except this one
-                if( propSize >= (int) sizeof( location))
-                    propSize = sizeof( location) - 1;
+                if( propSize >= (int) sizeof(location))
+                    propSize = sizeof(location) - 1;
                 strncpy( location, (const char *) prop, propSize );
                 location[ propSize ] = 0;
                 regEntry->setLocation( location );
                 propTable->removeObject( gIODTUnitKey );
                 noLocation = false;
     
-            } else if( noLocation && (0 == strcmp( name, "reg"))) {
+            } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
                 // default location - override later
-                sprintf( location, "%lX", *((UInt32 *) prop) );
+                snprintf(location, sizeof(location), "%lX", *((UInt32 *) prop));
                 regEntry->setLocation( location );
             }
         }
@@ -435,15 +435,21 @@ static bool GetUInt32( IORegistryEntry * regEntry, const OSSymbol * name,
         return( false );
 }
 
-IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
+static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
 {
     IORegistryEntry *	parent;
     UInt32		phandle;
+    OSData	    *	data;
+    unsigned int	len;
 
-    if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
-        parent = FindPHandle( phandle );
+    if( (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTInterruptParentKey )))
+      && (sizeof(UInt32) <= (len = data->getLength()))) {
+	if (((index + 1) * sizeof(UInt32)) > len)
+	    index = 0;
+	phandle = ((UInt32 *) data->getBytesNoCopy())[index];
+	parent = FindPHandle( phandle );
 
-    else if( 0 == regEntry->getProperty( "interrupt-controller"))
+    } else if( 0 == regEntry->getProperty( "interrupt-controller"))
         parent = regEntry->getParentEntry( gIODTPlane);
     else
         parent = 0;
@@ -462,7 +468,7 @@ const OSSymbol * IODTInterruptControllerName( IORegistryEntry * regEntry )
     assert( ok );
 
     if( ok) {
-        sprintf( buf, "IOInterruptController%08lX", phandle);
+        snprintf(buf, sizeof(buf), "IOInterruptController%08lX", phandle);
         sym = OSSymbol::withCString( buf );
     } else
         sym = 0;
@@ -481,8 +487,8 @@ static void IODTGetICellCounts( IORegistryEntry * regEntry,
         *aCellCount = 0;
 }
 
-UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
-				OSData ** spec, const OSSymbol ** controller )
+static UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, UInt32 index,
+				    OSData ** spec, const OSSymbol ** controller )
 {
     IORegistryEntry *parent = 0;
     OSData			*data;
@@ -494,12 +500,12 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
     UInt32			i, original_icells;
     bool			cmp, ok = false;
 
-    parent = IODTFindInterruptParent( regEntry );    
+    parent = IODTFindInterruptParent( regEntry, index );    
     IODTGetICellCounts( parent, &icells, &acells );
     addrCmp = 0;
     if( acells) {
         data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
-        if( data && (data->getLength() >= (acells * sizeof( UInt32))))
+        if( data && (data->getLength() >= (acells * sizeof(UInt32))))
             addrCmp = (UInt32 *) data->getBytesNoCopy();
     }
     original_icells = icells;
@@ -520,7 +526,7 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
             // found a controller - don't want to follow cascaded controllers
             parent = 0;
             *spec = OSData::withBytesNoCopy( (void *) intSpec,
-                                            icells * sizeof( UInt32));
+                                            icells * sizeof(UInt32));
             *controller = IODTInterruptControllerName( regEntry );
             ok = (*spec && *controller);
         } else if( parent && (data = OSDynamicCast( OSData,
@@ -529,7 +535,7 @@ UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
             map = (UInt32 *) data->getBytesNoCopy();
             endMap = map + (data->getLength() / sizeof(UInt32));
             data = OSDynamicCast( OSData, regEntry->getProperty( "interrupt-map-mask" ));
-            if( data && (data->getLength() >= ((acells + icells) * sizeof( UInt32))))
+            if( data && (data->getLength() >= ((acells + icells) * sizeof(UInt32))))
                 maskCmp = (UInt32 *) data->getBytesNoCopy();
             else
                 maskCmp = 0;
@@ -640,11 +646,12 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary *
     OSData *		local2;
     UInt32 *		localBits;
     UInt32 *		localEnd;
+    IOItemCount		index;
     OSData * 		map;
     OSObject *		oneMap;
     OSArray *		mapped;
     OSArray *		controllerInts;
-    const OSSymbol *	controller;
+    const OSSymbol *	controller = 0;
     OSArray *		controllers;
     UInt32		skip = 1;
     bool		ok, nw;
@@ -665,7 +672,8 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary *
     }
 
     localBits = (UInt32 *) local->getBytesNoCopy();
-    localEnd = localBits + (local->getLength() / sizeof( UInt32));
+    localEnd = localBits + (local->getLength() / sizeof(UInt32));
+    index = 0;
     mapped = OSArray::withCapacity( 1 );
     controllers = OSArray::withCapacity( 1 );
 
@@ -673,19 +681,20 @@ static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary *
 
     if( ok) do {
         if( nw) {
-            skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
+            skip = IODTMapOneInterrupt( regEntry, localBits, index, &map, &controller );
             if( 0 == skip) {
                 IOLog("%s: error mapping interrupt[%d]\n",
                         regEntry->getName(), mapped->getCount());
                 break;
             }
         } else {
-            map = OSData::withData( local, mapped->getCount() * sizeof( UInt32),
-				sizeof( UInt32));
+            map = OSData::withData( local, mapped->getCount() * sizeof(UInt32),
+				sizeof(UInt32));
             controller = gIODTDefaultInterruptController;
             controller->retain();
         }
 
+	index++;
         localBits += skip;
         mapped->setObject( map );
         controllers->setObject( controller );
@@ -907,7 +916,7 @@ void IODTSetResolving( IORegistryEntry * 	regEntry,
 
     persist.compareFunc = compareFunc;
     persist.locationFunc = locationFunc;
-    prop = OSData::withBytes( &persist, sizeof( persist));
+    prop = OSData::withBytes( &persist, sizeof(persist));
     if( !prop)
         return;
 
@@ -956,7 +965,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry,
     UInt32		*startRange;
     UInt32		*endRanges;
     bool		ok = true;
-    SInt32		diff, endDiff;
+    SInt32		diff, diff2, endDiff;
 
     IODTPersistent	*persist;
     IODTCompareAddressCellFunc	compare;
@@ -964,7 +973,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry,
     IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
     childCells = childAddressCells + childSizeCells;
 
-    bcopy( cellsIn, cell, 4 * childCells );
+    bcopy( cellsIn, cell, sizeof(UInt32) * childCells );
     if( childSizeCells > 1)
         *len = IOPhysical32( cellsIn[ childAddressCells ],
                              cellsIn[ childAddressCells + 1 ] );
@@ -987,7 +996,7 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry,
 	    // search
 	    startRange = (UInt32 *) prop->getBytesNoCopy();
 	    range = startRange;
-	    endRanges = range + (length / 4);
+	    endRanges = range + (length / sizeof(UInt32));
 
 	    prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
 	    if( prop) {
@@ -1000,9 +1009,14 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry,
 		 range < endRanges;
 		 range += (childCells + addressCells) ) {
 
-		// is cell start >= range start?
+		// is cell start within range?
 		diff = (*compare)( childAddressCells, cell, range );
-		if( diff < 0)
+
+		bcopy(range, endCell, childAddressCells * sizeof(UInt32));
+		endCell[childAddressCells - 1] += range[childCells + addressCells - 1];
+		diff2 = (*compare)( childAddressCells, cell, endCell );
+
+		if ((diff < 0) || (diff2 >= 0))
 		    continue;
 
 		ok = (0 == cell[childCells - 1]);
@@ -1035,8 +1049,8 @@ bool IODTResolveAddressCell( IORegistryEntry * regEntry,
 	    }
 
 	    // Get the physical start of the range from our parent
-	    bcopy( range + childAddressCells, cell, 4 * addressCells );
-	    bzero( cell + addressCells, 4 * sizeCells );
+	    bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
+	    bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
 
 	} /* else zero length range => pass thru to parent */