Changeset 54

Timestamp:

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

Author:

bird

Message:

Added kLdrModQueryImageUuid for Mach-O.

Location:

trunk

Files:

• include/k/kErrors.h (modified) (2 diffs)
• include/k/kLdr.h (modified) (2 diffs)
• kLdr/kLdrMod.c (modified) (2 diffs)
• kLdr/kLdrModLX.c (modified) (1 diff)
• kLdr/kLdrModMachO.c (modified) (6 diffs)
• kLdr/kLdrModNative.c (modified) (1 diff)
• kLdr/kLdrModPE.c (modified) (1 diff)

trunk/include/k/kErrors.h

@@ -206 +206 @@
 /** Unsupported CPU subtype found in a FAT entry. */
 #define KLDR_ERR_FAT_UNSUPPORTED_CPU_SUBTYPE            (KLDR_ERR_BASE + 37)
+/** The image has no UUID. */
+#define KLDR_ERR_NO_IMAGE_UUID                          (KLDR_ERR_BASE + 38)
 /** @} */
 
@@ -212 +214 @@
  */
 /** The base of the kLdrModPE specific status codes. */
-#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 38)
+#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 39)
 /** The machine isn't supported by the interpreter. */
 #define KLDR_ERR_PE_UNSUPPORTED_MACHINE                 (KLDR_ERR_PE_BASE + 0)

trunk/include/k/kLdr.h

@@ -614 +614 @@
 int     kLdrModGetStackInfo(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRSTACKINFO pStackInfo);
 int     kLdrModQueryMainEntrypoint(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRADDR pMainEPAddress);
+int     kLdrModQueryImageUuid(PKLDRMOD pMod, const void *pvBits, void *pvUuid, KSIZE cbUuid);
 int     kLdrModQueryResource(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 idType, const char *pszType,
                              KU32 idName, const char *pszName, KU32 idLang, PKLDRADDR pAddrRsrc, KSIZE *pcbRsrc);
@@ -699 +700 @@
     /** @copydoc kLdrModQueryMainEntrypoint */
     int (* pfnQueryMainEntrypoint)(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRADDR pMainEPAddress);
+    /** @copydoc kLdrModQueryImageUuid  */
+    int (* pfnQueryImageUuid)(PKLDRMOD pMod, const void *pvBits, void *pvUuid, KSIZE pcbUuid);
     /** @copydoc kLdrModQueryResource */
     int (* pfnQueryResource)(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 idType, const char *pszType,

trunk/kLdr/kLdrMod.c

@@ -511 +511 @@
  * @param   pvBits          Optional pointer to bits returned by kLdrModGetBits().
  *                          This can be used by some module interpreters to reduce memory consumption.
+ * @param   enmArch         The CPU architecture.
+ * @param   enmCpu          The CPU series/model.
  */
 int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KCPUARCH enmArch, KCPU enmCpu)
@@ -560 +562 @@
     *pMainEPAddress = 0;
     return pMod->pOps->pfnQueryMainEntrypoint(pMod, pvBits, BaseAddress, pMainEPAddress);
+}
+
+
+/**
+ * Queries the image UUID, if the image has one.
+ *
+ * @returns 0 and *pvUuid. Non-zero status code on failure.
+ * @param   pMod            The module.
+ * @param   pvBits          Optional pointer to bits returned by kLdrModGetBits() currently located at BaseAddress.
+ *                          This can be used by some module interpreters to reduce memory consumption.
+ * @param   pvUuid          Where to store the UUID.
+ * @param   cbUuid          Size of the UUID buffer, must be at least 16 bytes.
+ */
+int     kLdrModQueryImageUuid(PKLDRMOD pMod, const void *pvBits, void *pvUuid, KSIZE cbUuid)
+{
+    KLDRMOD_VALIDATE(pMod);
+    if (cbUuid < 16)
+        return KERR_INVALID_SIZE;
+    if (pMod->pOps->pfnQueryImageUuid)
+        return pMod->pOps->pfnQueryImageUuid(pMod, pvBits, pvUuid, cbUuid);
+    return KLDR_ERR_NO_IMAGE_UUID;
 }
 

trunk/kLdr/kLdrModLX.c

@@ -2640 +2640 @@
     kldrModLXGetStackInfo,
     kldrModLXQueryMainEntrypoint,
+    NULL /* pfnQueryImageUuid */,
     NULL /* fixme */,
     NULL /* fixme */,

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,

trunk/kLdr/kLdrModNative.c

@@ -1136 +1136 @@
     kldrModNativeGetStackInfo,
     kldrModNativeQueryMainEntrypoint,
+    NULL /* pfnQueryImageUuid */,
     NULL /* fixme */,
     NULL /* fixme */,

trunk/kLdr/kLdrModPE.c

@@ -1979 +1979 @@
     kldrModPEGetStackInfo,
     kldrModPEQueryMainEntrypoint,
+    NULL /* pfnQueryImageUuid */,
     NULL, /** @todo resources */
     NULL, /** @todo resources */