X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/39236c6e673c41db228275375ab7fdb0f837b292..04b8595b18b1b41ac7a206e4b3d51a635f8413d7:/iokit/Kernel/IODeviceTreeSupport.cpp

diff --git a/iokit/Kernel/IODeviceTreeSupport.cpp b/iokit/Kernel/IODeviceTreeSupport.cpp
index 5d6188086..6533ed937 100644
--- a/iokit/Kernel/IODeviceTreeSupport.cpp
+++ b/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -776,6 +776,7 @@ CompareKey( OSString * key,
     OSString		*string;
     const char		*ckey;
     UInt32			keyLen;
+    UInt32          nlen;
     const char		*names;
     const char		*lastName;
     bool			wild;
@@ -800,16 +801,16 @@ CompareKey( OSString * key,
 
     do {
         // for each name in the property
+        nlen = strnlen(names, lastName - names);
         if( wild)
-            matched = (0 == strncmp( ckey, names, keyLen - 1 ));
+            matched = ((nlen >= (keyLen - 1)) && (0 == strncmp(ckey, names, keyLen - 1)));
         else
-            matched = (keyLen == strlen( names ))
-                    && (0 == strncmp( ckey, names, keyLen ));
+            matched = (keyLen == nlen) && (0 == strncmp(ckey, names, keyLen));
 
         if( matched)
             result = names;
 
-        names = names + strlen( names) + 1;
+        names = names + nlen + 1;
 
     } while( (names < lastName) && (false == matched));
 
@@ -927,7 +928,7 @@ void IODTSetResolving( IORegistryEntry * 	regEntry,
     return;
 }
 
-#if defined(__arm__) || defined(__i386__) || defined(__x86_64__)
+#if   defined(__arm__) || defined(__i386__) || defined(__x86_64__)
 static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
 {
 	cellCount--;
@@ -1239,6 +1240,7 @@ OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber )
     OSData				*ret = 0;
     UInt32				*bits;
     UInt32				i;
+    size_t              nlen;
     char				*names;
     char				*lastName;
     UInt32				mask;
@@ -1266,15 +1268,16 @@ OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber )
     for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
 
         if( mask & (1 << i)) {
+            nlen = 1 + strnlen(names, lastName - names);
             if( i == deviceNumber) {
-                data = OSData::withBytesNoCopy( names, 1 + strlen( names));
+                data = OSData::withBytesNoCopy(names, nlen);
                 if( data) {
                     regEntry->setProperty("AAPL,slot-name", data);
                     ret = data;
                     data->release();
                 }
             } else
-                names += 1 + strlen( names);
+                names += nlen;
         }
     }