xnu-1228.tar.gz

[apple/xnu.git] / iokit / Kernel / IORegistryEntry.cpp

diff --git a/iokit/Kernel/IORegistryEntry.cpp b/iokit/Kernel/IORegistryEntry.cpp
index 16ee95a7d47c0b8a98a1ad471604cf171811ba8d..f039c28adef3a69569c91ca9391a7c124132efb0 100644 (file)
--- a/iokit/Kernel/IORegistryEntry.cpp
+++ b/iokit/Kernel/IORegistryEntry.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@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -54,7 +54,11 @@ OSDefineMetaClassAndStructors(IORegistryEntry, OSObject)
 #define kIORegPlaneChildSuffix         "ChildLinks"
 #define kIORegPlaneNameSuffix          "Name"
 #define kIORegPlaneLocationSuffix      "Location"
 #define kIORegPlaneChildSuffix         "ChildLinks"
 #define kIORegPlaneNameSuffix          "Name"
 #define kIORegPlaneLocationSuffix      "Location"

+

 #define kIORegPlaneParentSuffixLen     (sizeof(kIORegPlaneParentSuffix) - 1)
 #define kIORegPlaneParentSuffixLen     (sizeof(kIORegPlaneParentSuffix) - 1)

+#define kIORegPlaneChildSuffixLen      (sizeof(kIORegPlaneChildSuffix) - 1)
+#define kIORegPlaneNameSuffixLen       (sizeof(kIORegPlaneNameSuffix) - 1)
+#define kIORegPlaneLocationSuffixLen   (sizeof(kIORegPlaneLocationSuffix) - 1)

 
 static IORegistryEntry * gRegistryRoot;
 static OSDictionary *   gIORegistryPlanes;
 
 static IORegistryEntry * gRegistryRoot;
 static OSDictionary *   gIORegistryPlanes;


@@ -179,22 +183,21 @@ const IORegistryPlane * IORegistryEntry::makePlane( const char * name )
     char               key[ kIOMaxPlaneName + 16 ];
     char *             end;
 
     char               key[ kIOMaxPlaneName + 16 ];
     char *             end;
 

-    strncpy( key, name, kIOMaxPlaneName );
-    key[ kIOMaxPlaneName ] = 0;
-    end = key + strlen( name );
+    strlcpy( key, name, kIOMaxPlaneName + 1 );
+    end = key + strlen( key );

 
     nameKey = OSSymbol::withCString( key);
 
 
     nameKey = OSSymbol::withCString( key);
 

-    strcpy( end, kIORegPlaneParentSuffix );
+    strlcpy( end, kIORegPlaneParentSuffix, kIORegPlaneParentSuffixLen + 1 );

     parentKey = OSSymbol::withCString( key);
 
     parentKey = OSSymbol::withCString( key);
 

-    strcpy( end, kIORegPlaneChildSuffix );
+    strlcpy( end, kIORegPlaneChildSuffix, kIORegPlaneChildSuffixLen + 1 );

     childKey = OSSymbol::withCString( key);
 
     childKey = OSSymbol::withCString( key);
 

-    strcpy( end, kIORegPlaneNameSuffix );
+    strlcpy( end, kIORegPlaneNameSuffix, kIORegPlaneNameSuffixLen + 1 );

     pathNameKey = OSSymbol::withCString( key);
 
     pathNameKey = OSSymbol::withCString( key);
 

-    strcpy( end, kIORegPlaneLocationSuffix );
+    strlcpy( end, kIORegPlaneLocationSuffix, kIORegPlaneLocationSuffixLen + 1 );

     pathLocationKey = OSSymbol::withCString( key);
 
     plane = new IORegistryPlane;
     pathLocationKey = OSSymbol::withCString( key);
 
     plane = new IORegistryPlane;


@@ -340,15 +343,15 @@ void IORegistryEntry::free( void )
 
 #if DEBUG_FREE
 #define msg ": attached at free()"
 
 #if DEBUG_FREE
 #define msg ": attached at free()"

-    char buf[ strlen(msg) + 40 ];
+    int len = strlen(msg) + 40;
+    char buf[len];

 
     if( registryTable() && gIOServicePlane) {
         if( getParentSetReference( gIOServicePlane )
             || getChildSetReference( gIOServicePlane )) {
 
 
     if( registryTable() && gIOServicePlane) {
         if( getParentSetReference( gIOServicePlane )
             || getChildSetReference( gIOServicePlane )) {
 

-            strncpy( buf, getName(), 32);
-            buf[32] = 0;
-            strcat( buf, msg );
+            strlcpy( buf, getName(), 32);
+            strlcat( buf, msg, len );

             IOPanic( buf );
         }
     }
             IOPanic( buf );
         }
     }


@@ -845,7 +848,7 @@ bool IORegistryEntry::getPath(      char * path, int * length,
     IORegistryEntry *  parent;
     const OSSymbol *   alias;
     int                        index;
     IORegistryEntry *  parent;
     const OSSymbol *   alias;
     int                        index;

-    int                        len, maxLength, compLen;
+    int                        len, maxLength, compLen, aliasLen;

     char *             nextComp;
     bool               ok;
 
     char *             nextComp;
     bool               ok;
 


@@ -859,16 +862,17 @@ bool IORegistryEntry::getPath(    char * path, int * length,
     len = plane->nameKey->getLength();
     if( len >= maxLength)
        return( false);
     len = plane->nameKey->getLength();
     if( len >= maxLength)
        return( false);

-    strcpy( nextComp, plane->nameKey->getCStringNoCopy());
+    strlcpy( nextComp, plane->nameKey->getCStringNoCopy(), len + 1);

     nextComp[ len++ ] = ':';
     nextComp += len;
 
     if( (alias = hasAlias( plane ))) {
     nextComp[ len++ ] = ':';
     nextComp += len;
 
     if( (alias = hasAlias( plane ))) {

-       len += alias->getLength();
+       aliasLen = alias->getLength();
+       len += aliasLen;

        ok = (maxLength > len);
        *length = len;
        if( ok)
        ok = (maxLength > len);
        *length = len;
        if( ok)

-           strcpy( nextComp, alias->getCStringNoCopy());
+           strlcpy( nextComp, alias->getCStringNoCopy(), aliasLen + 1);

        return( ok );
     }
 
        return( ok );
     }
 


@@ -911,9 +915,9 @@ bool IORegistryEntry::getPath(      char * path, int * length,
             nextComp = path + len;
 
             compLen = alias->getLength();
             nextComp = path + len;
 
             compLen = alias->getLength();

-            ok = (maxLength > len + compLen);
+            ok = (maxLength > (len + compLen));

             if( ok)
             if( ok)

-                strcpy( nextComp, alias->getCStringNoCopy());
+                strlcpy( nextComp, alias->getCStringNoCopy(), compLen + 1);

         } else {
             compLen = maxLength - len;
             ok = entry->getPathComponent( nextComp + 1, &compLen, plane );
         } else {
             compLen = maxLength - len;
             ok = entry->getPathComponent( nextComp + 1, &compLen, plane );


@@ -955,14 +959,14 @@ bool IORegistryEntry::getPathComponent( char * path, int * length,
     else
        locLen = 0;
 
     else
        locLen = 0;
 

-    ok = ((len + locLen) < maxLength);
+    ok = ((len + locLen + 1) < maxLength);

     if( ok) {
     if( ok) {

-        strcpy( path, compName );
+        strlcpy( path, compName, len + 1 );

        if( loc) {
             path += len;
             len += locLen;
             *path++ = '@';
        if( loc) {
             path += len;
             len += locLen;
             *path++ = '@';

-            strcpy( path, loc );
+            strlcpy( path, loc, locLen );

        }
         *length = len;
     }
        }
         *length = len;
     }


@@ -1123,8 +1127,7 @@ const char * IORegistryEntry::dealiasPath(
         {}
     end--;
     if( (end - path) < kIOMaxPlaneName) {
         {}
     end--;
     if( (end - path) < kIOMaxPlaneName) {

-        strncpy( temp, path, end - path );
-        temp[ end - path ] = 0;
+        strlcpy( temp, path, end - path + 1 );

 
         RLOCK;
         entry = IORegistryEntry::fromPath( "/aliases", plane );
 
         RLOCK;
         entry = IORegistryEntry::fromPath( "/aliases", plane );


@@ -1167,8 +1170,7 @@ IORegistryEntry * IORegistryEntry::fromPath(
        // get plane name
         end = strchr( path, ':' );
        if( end && ((end - path) < kIOMaxPlaneName)) {
        // get plane name
         end = strchr( path, ':' );
        if( end && ((end - path) < kIOMaxPlaneName)) {

-           strncpy( temp, path, end - path );
-           temp[ end - path ] = 0;
+           strlcpy( temp, path, end - path + 1 );

             plane = getPlane( temp );
            path = end + 1;
        }
             plane = getPlane( temp );
            path = end + 1;
        }


@@ -1219,10 +1221,10 @@ IORegistryEntry * IORegistryEntry::fromPath(
 
        if( opath && length) {
             // copy out residual path
 
        if( opath && length) {
             // copy out residual path

-           len2 = len + strlen( path );
-           if( len2 < *length)
-                strcpy( opath + len, path );
-           *length = len2;
+           len2 = strlen( path );
+           if( (len + len2) < *length)
+                strlcpy( opath + len, path, len2 + 1 );
+           *length = (len + len2);

 
        } else if( path[0])
            // no residual path => must be no tail for success
 
        } else if( path[0])
            // no residual path => must be no tail for success


@@ -1556,12 +1558,16 @@ bool IORegistryEntry::inPlane( const IORegistryPlane * plane ) const
            const OSSymbol *key;
 
             while( (key = (OSSymbol *) iter->getNextObject()) ) {
            const OSSymbol *key;
 
             while( (key = (OSSymbol *) iter->getNextObject()) ) {

-               const char *keysuffix;
+               size_t keysuffix;

 
                // Get a pointer to this keys suffix
 
                // Get a pointer to this keys suffix

-               keysuffix = key->getCStringNoCopy()
-                         + key->getLength() - kIORegPlaneParentSuffixLen;
-               if( !strcmp(keysuffix, kIORegPlaneParentSuffix) ) {
+               keysuffix = key->getLength();
+               if (keysuffix <= kIORegPlaneParentSuffixLen)
+                   continue;
+               keysuffix -= kIORegPlaneParentSuffixLen;
+               if( !strncmp(key->getCStringNoCopy() + keysuffix, 
+                               kIORegPlaneParentSuffix, 
+                               kIORegPlaneParentSuffixLen + 1) ) {

                    ret = true;
                    break;
                }
                    ret = true;
                    break;
                }


@@ -1857,7 +1863,7 @@ void IORegistryIterator::enterEntry( const IORegistryPlane * enterPlane )
     IORegCursor *      prev;
 
     prev = where;
     IORegCursor *      prev;
 
     prev = where;

-    where = (IORegCursor *) IOMalloc( sizeof( IORegCursor));
+    where = (IORegCursor *) IOMalloc( sizeof(IORegCursor));

     assert( where);
 
     if( where) {
     assert( where);
 
     if( where) {


@@ -1887,7 +1893,7 @@ bool IORegistryIterator::exitEntry( void )
     if( where != &start) {
        gone = where;
         where = gone->next;
     if( where != &start) {
        gone = where;
         where = gone->next;

-        IOFree( gone, sizeof( IORegCursor));
+        IOFree( gone, sizeof(IORegCursor));

        return( true);
 
     } else
        return( true);
 
     } else