fixup! Support running scripts as the entrypoint

Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
gramineproject · Jul 21, 2022 · 0d88aa7 · 0d88aa7
1 parent ebf1a47
commit 0d88aa7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/libos/include/libos_internal.h b/libos/include/libos_internal.h
@@ -18,7 +18,7 @@
 #include "pal.h"
 #include "pal_error.h"
 
-noreturn void* libos_init(int argc, const char** argv, const char** envp);
+noreturn void* libos_init(const char** argv, const char** envp);
 
 /* important macros and static inline functions */
 

diff --git a/libos/src/arch/x86_64/start.S b/libos/src/arch/x86_64/start.S
@@ -13,9 +13,9 @@ libos_start:
     xorq %rbp, %rbp
 
     # Arguments for libos_init:
-    movq 0(%rsp), %rdi         # argc
-    leaq 8(%rsp), %rsi         # argv
-    leaq 8(%rsi,%rdi,8), %rdx  # envp, after all args (including argv[argc] = NULL)
+    movq 0(%rsp), %r8          # argc, unused by libos_init, used to calculate location of envp
+    leaq 8(%rsp), %rdi         # argv
+    leaq 8(%rdi,%r8,8), %rsi   # envp, after all args (including argv[argc] = NULL)
 
     # Required by System V AMD64 ABI.
     andq  $~0xF, %rsp

diff --git a/libos/src/libos_init.c b/libos/src/libos_init.c
@@ -366,8 +366,7 @@ static int read_environs(const char** envp) {
         }                                                                   \
     } while (0)
 
-noreturn void* libos_init(int argc, const char** argv, const char** envp) {
-    __UNUSED(argc);
+noreturn void* libos_init(const char** argv, const char** envp) {
     g_pal_public_state = PalGetPalPublicState();
     assert(g_pal_public_state);
 

diff --git a/libos/test/regression/shebang_test_script.sh b/libos/test/regression/shebang_test_script.sh
@@ -1,2 +1,2 @@
-#!  /bin/sh
-scripts/foo.sh
+#!/bin/sh
+exec scripts/foo.sh
diff --git a/libos/test/regression/test_libos.py b/libos/test/regression/test_libos.py
@@ -214,17 +214,17 @@ def test_210_exec_invalid_args(self):
         self.assertIn('execve(invalid-argv) correctly returned error', stdout)
         self.assertIn('execve(invalid-envp) correctly returned error', stdout)
 
-    @unittest.skipIf(USES_MUSL, 'Test uses /bin/sh from the host which is usually built against'
-    'glibc')
+    @unittest.skipIf(USES_MUSL,
+        'Test uses /bin/sh from the host which is usually built against glibc')
     def test_211_exec_script(self):
         stdout, _ = self.run_binary(['exec_script'])
         self.assertIn('Printing Args: '
             'scripts/baz.sh ECHO FOXTROT GOLF scripts/bar.sh '
             'ALPHA BRAVO CHARLIE DELTA '
             'scripts/foo.sh STRING FROM EXECVE', stdout)
 
-    @unittest.skipIf(USES_MUSL, 'Test uses /bin/sh from the host which is usually built against'
-    'glibc')
+    @unittest.skipIf(USES_MUSL,
+        'Test uses /bin/sh from the host which is usually built against glibc')
     def test_212_shebang_test_script(self):
         stdout, _ = self.run_binary(['shebang_test_script'])
         self.assertIn('Printing Args: '