elf: Fix statically linked executable entry point

Statically linked executable may not have PT_INTERP present so we also need to check for ET_EXEC object file type when looking up the entry point. Signed-off-by: Pekka Enberg <[email protected]>
cloudius-systems · Nov 18, 2014 · fa19f90 · fa19f90
1 parent a2de1ca
commit fa19f90
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/elf.cc b/core/elf.cc
@@ -25,6 +25,7 @@
 #include <osv/stubbing.hh>
 #include <sys/utsname.h>
 #include <osv/demangle.hh>
+#include "api/elf.h"
 
 #include "arch.hh"
 
@@ -181,10 +182,10 @@ const char * object::symbol_name(const Elf64_Sym * sym) {
 }
 
 void* object::entry_point() const {
-    if (!_is_executable) {
-        return nullptr;
+    if (_is_executable || _ehdr.e_type == ET_EXEC) {
+        return _base + _ehdr.e_entry;
     }
-    return _base + _ehdr.e_entry;
+    return nullptr;
 }
 
 file::file(program& prog, ::fileref f, std::string pathname)