Changeset 18431 in vbox

Timestamp:

Mar 28, 2009 2:10:03 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45238

Message:

PDMLdr.cpp: Another annoying conversion warning, made the code paranoid while at it.

File:

• trunk/src/VBox/VMM/PDMLdr.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -460 +460 @@
          * Allocate space in the hypervisor.
          */
-        size_t      cb = RTLdrSize(pModule->hLdrMod);
+        size_t          cb = RTLdrSize(pModule->hLdrMod);
         cb = RT_ALIGN_Z(cb, PAGE_SIZE);
-        uint32_t    cPages = cb >> PAGE_SHIFT;
-        PSUPPAGE    paPages = (PSUPPAGE)RTMemTmpAlloc(cPages * sizeof(paPages[0]));
-        if (paPages)
-        {
-            rc = SUPR3PageAllocEx(cPages, 0 /*fFlags*/, &pModule->pvBits, NULL /*pR0Ptr*/, paPages);
-            if (RT_SUCCESS(rc))
-            {
-                RTGCPTR GCPtr;
-                rc = MMR3HyperMapPages(pVM, pModule->pvBits, NIL_RTR0PTR,
-                                       cPages, paPages, pModule->szName, &GCPtr);
+        uint32_t        cPages = (uint32_t)(cb >> PAGE_SHIFT);
+        if (((size_t)cPages << PAGE_SHIFT) == cb)
+        {
+            PSUPPAGE    paPages = (PSUPPAGE)RTMemTmpAlloc(cPages * sizeof(paPages[0]));
+            if (paPages)
+            {
+                rc = SUPR3PageAllocEx(cPages, 0 /*fFlags*/, &pModule->pvBits, NULL /*pR0Ptr*/, paPages);
                 if (RT_SUCCESS(rc))
                 {
-                    MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
-
-                    /*
-                     * Get relocated image bits.
-                     */
-                    Assert(MMHyperR3ToRC(pVM, pModule->pvBits) == GCPtr);
-                    pModule->ImageBase = GCPtr;
-                    PDMGETIMPORTARGS Args;
-                    Args.pVM = pVM;
-                    Args.pModule = pModule;
-                    rc = RTLdrGetBits(pModule->hLdrMod, pModule->pvBits, pModule->ImageBase, pdmR3GetImportRC, &Args);
+                    RTGCPTR GCPtr;
+                    rc = MMR3HyperMapPages(pVM, pModule->pvBits, NIL_RTR0PTR,
+                                           cPages, paPages, pModule->szName, &GCPtr);
                     if (RT_SUCCESS(rc))
                     {
+                        MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+
                         /*
-                         * Insert the module.
+                         * Get relocated image bits.
                          */
-                        PUVM pUVM = pVM->pUVM;
-                        if (pUVM->pdm.s.pModules)
+                        Assert(MMHyperR3ToRC(pVM, pModule->pvBits) == GCPtr);
+                        pModule->ImageBase = GCPtr;
+                        PDMGETIMPORTARGS Args;
+                        Args.pVM = pVM;
+                        Args.pModule = pModule;
+                        rc = RTLdrGetBits(pModule->hLdrMod, pModule->pvBits, pModule->ImageBase, pdmR3GetImportRC, &Args);
+                        if (RT_SUCCESS(rc))
                         {
-                            /* we don't expect this list to be very long, so rather save the tail pointer. */
-                            PPDMMOD pCur = pUVM->pdm.s.pModules;
-                            while (pCur->pNext)
-                                pCur = pCur->pNext;
-                            pCur->pNext = pModule;
+                            /*
+                             * Insert the module.
+                             */
+                            PUVM pUVM = pVM->pUVM;
+                            if (pUVM->pdm.s.pModules)
+                            {
+                                /* we don't expect this list to be very long, so rather save the tail pointer. */
+                                PPDMMOD pCur = pUVM->pdm.s.pModules;
+                                while (pCur->pNext)
+                                    pCur = pCur->pNext;
+                                pCur->pNext = pModule;
+                            }
+                            else
+                                pUVM->pdm.s.pModules = pModule; /* (pNext is zeroed by alloc) */
+                            Log(("PDM: RC Module at %RRv %s (%s)\n", (RTRCPTR)pModule->ImageBase, pszName, pszFilename));
+                            RTMemTmpFree(pszFile);
+                            RTMemTmpFree(paPages);
+                            return VINF_SUCCESS;
                         }
-                        else
-                            pUVM->pdm.s.pModules = pModule; /* (pNext is zeroed by alloc) */
-                        Log(("PDM: RC Module at %RRv %s (%s)\n", (RTRCPTR)pModule->ImageBase, pszName, pszFilename));
-                        RTMemTmpFree(pszFile);
-                        RTMemTmpFree(paPages);
-                        return VINF_SUCCESS;
+                    }
+                    else
+                    {
+                        AssertRC(rc);
+                        SUPR3PageFreeEx(pModule->pvBits, cPages);
                     }
                 }
                 else
-                {
-                    AssertRC(rc);
-                    SUPR3PageFreeEx(pModule->pvBits, cPages);
-                }
+                    AssertMsgFailed(("SUPPageAlloc(%d,) -> %Rrc\n", cPages, rc));
+                RTMemTmpFree(paPages);
             }
             else
-                AssertMsgFailed(("SUPPageAlloc(%d,) -> %Rrc\n", cPages, rc));
-            RTMemTmpFree(paPages);
+                rc = VERR_NO_TMP_MEMORY;
         }
         else
-            rc = VERR_NO_TMP_MEMORY;
+            rc = VERR_OUT_OF_RANGE;
         int rc2 = RTLdrClose(pModule->hLdrMod);
         AssertRC(rc2);