Ticket #8520: runtimeloader_archcheck_2.diff

headers/os/support/Errors.h

@@ -74 +74 @@
 
 #define B_DEBUGGER_ALREADY_INSTALLED    (B_OS_ERROR_BASE + 0x400)
 
+#define B_BAD_IMAGE_ARCHITECTURE    (B_OS_ERROR_BASE + 0x410)
+#define B_BAD_IMAGE_PLATFORM        (B_OS_ERROR_BASE + 0x411)
+
 /* Application Kit Errors */
 #define B_BAD_REPLY                         (B_APP_ERROR_BASE + 0)
 #define B_DUPLICATE_REPLY                   (B_APP_ERROR_BASE + 1)

src/system/runtime_loader/runtime_loader.cpp

@@ -215 +215 @@
 }
 
 
+static status_t
+test_architecture(uint16 elfMachine)
+{
+    char name[128];
+    switch (elfMachine) {
+        case EM_386:
+        case EM_486:
+            name = "x86";
+            #if defined(__i386__)
+            return B_OK;
+            #endif
+            // TODO: Multilib check for i386 on x86_64?
+            break;
+        case EM_X86_64:
+            name = "x86_64";
+            #if defined(__x86_64__)
+            return B_OK;
+            #endif
+            break;
+        case EM_PPC:
+        case EM_PPC64:
+            name = "PowerPC";
+            #if defined(__powerpc__)
+            return B_OK;
+            #endif
+            break;
+        case EM_ARM:
+            name = "ARM";
+            #if defined(__arm__)
+            return B_OK;
+            #endif
+            break;
+        case EM_MIPS:
+            name = "MIPS";
+            #if defined(__mips__)
+            return B_OK;
+            #endif
+            break;
+        default:
+            name = "Unknown";
+    }
+    TRACE("runtime_loader: %s not correct architecture\n", name);
+    return B_BAD_IMAGE_ARCHITECTURE;
+}
+
+
 int
 open_executable(char *name, image_type type, const char *rpath,
     const char *programPath, const char *compatibilitySubDir)
@@ -349 +395 @@
         }
     } else if (status == B_OK) {
         struct Elf32_Ehdr *elfHeader = (struct Elf32_Ehdr *)buffer;
+
+        status = test_architecture(elfHeader->e_machine);
+
         if (elfHeader->e_entry == 0) {
             // we don't like to open shared libraries
             status = B_NOT_AN_EXECUTABLE;