From c93d358db133af3a4014c09f7b4ccf49edfeba15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit@scylladb.com>
Date: Wed, 26 Oct 2016 14:09:13 +0200
Subject: [PATCH] elf/app: Pass argc and argv to library initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As explained nicely in golang/go#13492, since 1996
glibc's dlopen() passes argv and a bunch of other
stuff to the initialization functions of shared
objects, while we don't pass any argument
(see object::run_init_funcs()). Golang code
(ref #522), in particular, assumes it gets argv,
auxv, etc., this way.

Fixes: #795

Signed-off-by: Benoît Canet <benoit@scylladb.com>
---
 core/app.cc        |  2 +-
 core/elf.cc        | 12 ++++++------
 include/osv/elf.hh |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/app.cc b/core/app.cc
index cf60aaeca0..25e0a435d9 100644
--- a/core/app.cc
+++ b/core/app.cc
@@ -278,7 +278,7 @@ void application::main()
 {
     __libc_stack_end = __builtin_frame_address(0);
 
-    elf::get_program()->init_library();
+    elf::get_program()->init_library(_args.size(), _argv.get());
     sched::thread::current()->set_name(_command);
 
     if (_main) {
diff --git a/core/elf.cc b/core/elf.cc
index b9da12655f..9aea3be518 100644
--- a/core/elf.cc
+++ b/core/elf.cc
@@ -928,19 +928,19 @@ std::string object::pathname()
 }
 
 // Run the object's static constructors or similar initialization
-void object::run_init_funcs()
+void object::run_init_funcs(int argc, char** argv)
 {
     if (dynamic_exists(DT_INIT)) {
         auto func = dynamic_ptr<void>(DT_INIT);
         if (func) {
-            reinterpret_cast<void(*)()>(func)();
+            reinterpret_cast<void(*)(int, char**)>(func)(argc, argv);
         }
     }
     if (dynamic_exists(DT_INIT_ARRAY)) {
-        auto funcs = dynamic_ptr<void (*)()>(DT_INIT_ARRAY);
+        auto funcs = dynamic_ptr<void(*)(int, char**)>(DT_INIT_ARRAY);
         auto nr = dynamic_val(DT_INIT_ARRAYSZ) / sizeof(*funcs);
         for (auto i = 0u; i < nr; ++i) {
-            funcs[i]();
+            funcs[i](argc, argv);
         }
     }
 }
@@ -1190,7 +1190,7 @@ program::get_library(std::string name, std::vector<std::string> extra_path, bool
     return ret;
 }
 
-void program::init_library()
+void program::init_library(int argc, char** argv)
 {
     // get the list of weak pointers before iterating on them
     std::vector<std::shared_ptr<object>> loaded_objects =
@@ -1204,7 +1204,7 @@ void program::init_library()
         loaded_objects[i]->setprivate(true);
     }
     for (int i = size - 1; i >= 0; i--) {
-        loaded_objects[i]->run_init_funcs();
+        loaded_objects[i]->run_init_funcs(argc, argv);
     }
     for (unsigned i = 0; i < size; i++) {
         loaded_objects[i]->setprivate(false);
diff --git a/include/osv/elf.hh b/include/osv/elf.hh
index 494ed4503f..280c9b0197 100644
--- a/include/osv/elf.hh
+++ b/include/osv/elf.hh
@@ -335,7 +335,7 @@ public:
     const std::vector<Elf64_Phdr> *phdrs();
     std::string soname();
     std::string pathname();
-    void run_init_funcs();
+    void run_init_funcs(int argc, char** argv);
     void run_fini_funcs();
     template <typename T = void>
     T* lookup(const char* name);
@@ -528,7 +528,7 @@ public:
     std::shared_ptr<elf::object>
     get_library(std::string lib, std::vector<std::string> extra_path = {}, bool no_init = false);
 
-    void init_library();
+    void init_library(int argc = 0, char **argv = nullptr);
 
     /**
      * Set the default search path for get_library().