Changeset 54 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Oct 9, 2013, 9:52:48 PM (12 years ago)

Author:

bird

Message:

Added kLdrModQueryImageUuid for Mach-O.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (6 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -164 +164 @@
     /** Pointer to the loaded string table. */
     char                   *pchStrings;
+
+    /** The image UUID, all zeros if not found. */
+    KU8                     abImageUuid[16];
 
     /** The RVA of the Global Offset Table. */
@@ -475 +478 @@
     pModMachO->cchStrings = 0;
     pModMachO->pchStrings = NULL;
+    kHlpMemSet(pModMachO->abImageUuid, 0, sizeof(pModMachO->abImageUuid));
     pModMachO->GotRVA = NIL_KLDRADDR;
     pModMachO->JmpStubsRVA = NIL_KLDRADDR;
@@ -1117 +1121 @@
         const segment_command_64_t *pSeg64;
         const symtab_command_t     *pSymTab;
+        const uuid_command_t       *pUuid;
     } u;
     const char *pchCurSegName = NULL;
@@ -1426 +1431 @@
                 break;
 
+            case LC_UUID:
+                kHlpMemCopy(pModMachO->abImageUuid, u.pUuid->uuid, sizeof(pModMachO->abImageUuid));
+                break;
+
             default:
                 break;
@@ -2404 +2413 @@
     *pMainEPAddress = NIL_KLDRADDR;
 #endif
+    return 0;
+}
+
+
+/** @copydoc kLdrModQueryImageUuid */
+static int kldrModMachOQueryImageUuid(PKLDRMOD pMod, const void *pvBits, void *pvUuid, KSIZE cbUuid)
+{
+    PKLDRMODMACHO pModMachO = (PKLDRMODMACHO)pMod->pvData;
+    kHlpMemSet(pvUuid, 0, cbUuid);
+    if (kHlpMemComp(pvUuid, pModMachO->abImageUuid, sizeof(pModMachO->abImageUuid)) == 0)
+        return KLDR_ERR_NO_IMAGE_UUID;
+    kHlpMemCopy(pvUuid, pModMachO->abImageUuid, sizeof(pModMachO->abImageUuid));
     return 0;
 }
@@ -3739 +3760 @@
     kldrModMachOGetStackInfo,
     kldrModMachOQueryMainEntrypoint,
+    kldrModMachOQueryImageUuid,
     NULL,
     NULL,