summary refs log tree commit diff stats
path: root/linux-user/linuxload.c
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2013-08-30 01:46:44 +0200
committerRiku Voipio <riku.voipio@linaro.org>2013-09-24 10:47:07 +0300
commit03cfd8faa7ffb7201e2949b99c2f35b1fef7078b (patch)
treef6eebab9322436e4bfd6e27de22a4217bcd557df /linux-user/linuxload.c
parent0d78b3b5b1b5c391aa96b481be106de023810b66 (diff)
downloadfocaccia-qemu-03cfd8faa7ffb7201e2949b99c2f35b1fef7078b.tar.gz
focaccia-qemu-03cfd8faa7ffb7201e2949b99c2f35b1fef7078b.zip
linux-user: add support of binfmt_misc 'O' flag
The binfmt_misc module can calculate the credentials and security
token according to the binary instead of to the interpreter if the
'C' flag is enabled.

To be able to execute non-readable binaries, this flag implies 'O'
flag. When 'O' flag is enabled, bintfmt_misc opens the file for
reading and pass the file descriptor to the interpreter.

References:
linux/Documentation/binfmt_misc.txt          ['O' and 'C' description]
linux/fs/binfmt_misc.c linux/fs/binfmt_elf.c [ AT_EXECFD usage ]

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user/linuxload.c')
-rw-r--r--linux-user/linuxload.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index 5cd6d91554..a1fe5ed9ae 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -131,7 +131,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
     return sp;
 }
 
-int loader_exec(const char * filename, char ** argv, char ** envp,
+int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
              struct target_pt_regs * regs, struct image_info *infop,
              struct linux_binprm *bprm)
 {
@@ -140,11 +140,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
 
     bprm->p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
     memset(bprm->page, 0, sizeof(bprm->page));
-    retval = open(filename, O_RDONLY);
-    if (retval < 0) {
-        return -errno;
-    }
-    bprm->fd = retval;
+    bprm->fd = fdexec;
     bprm->filename = (char *)filename;
     bprm->argc = count(argv);
     bprm->argv = argv;