Changeset 4879 for trunk/src

Timestamp:

Jan 8, 2001, 7:04:23 PM (25 years ago)

Author:

bird

Message:

Fixed two bugs in the ldrCheckInternalName replacement which are
relally features/bugs in OS/2.

File:

• trunk/src/win32k/ldr/myldrCheckInternalName.cpp (modified) (3 diffs)

trunk/src/win32k/ldr/myldrCheckInternalName.cpp

@@ -1 @@
-/* $Id: myldrCheckInternalName.cpp,v 1.1 2000-12-11 06:31:52 bird Exp $
+/* $Id: myldrCheckInternalName.cpp,v 1.2 2001-01-08 18:04:23 bird Exp $
  *
  * ldrCheckInternalName - ldrCheckInternalName replacement with support for
@@ -57 +57 @@
  *
  * @remark      This function will have to change slightly when we're starting to
- *              support ELF shared libraries.
+ *              support ELF shared libraries (ie. .so-files).
  */
 ULONG LDRCALL myldrCheckInternalName(PMTE pMTE)
@@ -81 +81 @@
     PCHAR   pachExt;                    /* Pointer to the extention part of pachFilename. (not dot!) */
     int     cchExt;                     /* Length of the extention part of pachFilename. (not dot!) */
-    PSMTE   pSMTE;                      /* Pointer to swap mte. */
+    APIRET  rc;                         /* Return code. */
 
-    /* Return successfully if not library module. */
+
+    /*
+     * Return successfully if not library module.
+     */
     if (!(pMTE->mte_flags1 & LIBRARYMOD))
         return NO_ERROR;
 
-    /* Uppercase and parse filename in ldrpFileNameBuf */
+
+    /*
+     * Uppercase and parse filename in ldrpFileNameBuf
+     */
     cchName = (int)ldrGetFileName2(ldrpFileNameBuf, (PCHAR*)SSToDS(&pachName), (PCHAR*)SSToDS(&pachExt));
     cchExt = (pachExt) ? strlen(pachExt) : 0;
     ldrUCaseString(pachName, cchName + cchExt + 1);
-    if ((pMTE->mte_flags1 & CLASS_MASK) == CLASS_GLOBAL && (cchExt != 3 || memcmp(pachExt, "DLL", 3)))
-        cchName += cchExt + 1;          /* Internal name includes extention if the extention is not .DLL! */
-                                        /* If no extention the '.' should still be there! */
 
-    /* Compare the internal name with the filename and return accordingly. */
-    pSMTE = pMTE->mte_swapmte;
-    #ifdef DEBUG
-    APIRET rc =
-    #else
-    return
-    #endif
-            (   pSMTE->smte_restab != NULL
-             && *(PCHAR)pSMTE->smte_restab == cchName
-             && (cchExt == 0 && (pMTE->mte_flags1 & CLASS_MASK) == CLASS_GLOBAL
-                 ?      !memcmp(pachName, (PCHAR)pSMTE->smte_restab + 1, cchName - 1)   /* No extention. Internal name should have a signle dot at the end then. */
-                    &&  ((PCHAR)pSMTE->smte_restab)[cchName] == '.'
-                 : !memcmp(pachName, (PCHAR)pSMTE->smte_restab + 1, cchName)            /* Extention, .DLL or not global class. */
-                )
-             )
-            ? NO_ERROR
-            : ERROR_INVALID_NAME;
-    #ifdef DEBUG
+
+    /*
+     * Do the compare - DllFix case or standard case.
+     */
+    if (cchName > 8
+        || (   (pMTE->mte_flags1 & CLASS_MASK) == CLASS_GLOBAL
+            && (cchExt != 3 || strcmp(pachExt, "DLL"))  /* Extention != DLL. */
+            )
+        )
+    {   /*
+         * Rules for long DLL names or GLOBAL dlls with extention <> DLL:
+         *  1. If DLL extention, the internal name don't need to have an extention,
+         *     but it could have.
+         *  2. If not DLL extention, then internal name must have an extention.
+         *  3. If no extetion the internal name should end with a '.'.
+         */
+        PCHAR   pachResName = (PCHAR)pMTE->mte_swapmte->smte_restab;
+
+        if (pachExt != NULL && cchExt == 3 && !memcmp(pachExt, "DLL", 3))   /* DLL extention. */
+        {   /* (1) */
+            rc =(   (   *pachResName == cchName
+                     || *pachResName == cchName + cchExt + 1)
+                 && !memcmp(pachResName + 1, pachName, *pachResName)
+                 );
+        }
+        else if (cchExt > 0)            /* Extention. */
+        {   /* (2) */
+            rc =(   *pachResName == cchName + cchExt + 1
+                 && !memcmp(pachResName + 1, pachName, *pachResName)
+                 );
+        }                               /* No extetion. */
+        else
+        {   /* (3) */
+            rc =(   *pachResName == cchName + 1
+                 && pachResName[cchName + 1] == '.'
+                 && !memcmp(pachResName + 1, pachName, cchName)
+                 );
+        }
+        rc = (rc) ? NO_ERROR : ERROR_INVALID_NAME;
+    }
+    else
+    {   /*
+         * Rules for short DLL names. ( < 8 chars):
+         *  1.  The internal name must match the DLL name.
+         *  2b. If the DLL name is 8 chars the internal name could have extra chars (but we don't check).
+         *          (This is a feature/bug.)
+         *  2a. If the DLL name is less than 8 chars the internal name should match exactly.
+         */
+        #if 0
+            /* This was the way it should be implemented, but code is buggy.
+             * Current code works like this:
+             *  rc =(   memcmp(pachName, pMTE->mte_modname, cchName)
+             *       && (   cchName == 8
+             *           || pMTE->mte_modname[cchName] == '\0'
+             *           )
+             *       ) ? ERROR_INVALID_NAME : NO_ERROR;
+             *
+             * This is so old that it has become an persistant bug in some ways.
+             * The correct check will break Lotus Freelance for example.
+             * But, the applications which are broken all seems to include the
+             * .DLL extention in the internal name (and have length which is
+             * shorter than 8 chars).
+             * So, a correction will simply be to remove any .DLL extention
+             * of the internal name before setting it ldrCreateMte. This fix
+             * could always be done here too.
+             *
+             * BTW. I managed to exploit this bug to replace doscall1.dll.
+             *      Which is very nasty!
+             */
+        rc =(   !memcmp(pachName, pMTE->mte_modname, cchName)   /* (1) */
+             && (   cchName == 8                                /* (2a) */
+                 || pMTE->mte_modname[cchName] == '\0'          /* (2b) */
+                 )
+             ) ? NO_ERROR : ERROR_INVALID_NAME;
+        #else
+        /* For the issue of compatibly with the bug we'll call the real function. */
+        rc = ldrCheckInternalName(pMTE);
+        #endif
+    }
+
+
+    /*
+     * Log answer and return it.
+     */
     kprintf(("myldrCheckInternalName: pMTE=0x%08x intname=%.*s path=%s rc=%d\n",
              pMTE, *(PCHAR)pMTE->mte_swapmte->smte_restab, (PCHAR)pMTE->mte_swapmte->smte_restab + 1, ldrpFileNameBuf, rc));
+
     return rc;
-    #endif
 }