diff options
| author | Riku Voipio <riku.voipio@iki.fi> | 2009-03-27 17:54:18 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2009-03-30 08:39:55 +0300 |
| commit | c9d3a0a64cfcee1a1a643c6f95d4832a6846762a (patch) | |
| tree | c37e8d5bdbe3c10531a67bd7774d89314449949d | |
| parent | ee12d82a51bf7f22ab359c5449488ae672767d12 (diff) | |
Prefer -U LD_PRELOAD over -drop-ld-preload
We want to get rid of the stupid -drop-ld-preload flag in qemu upstream.
Therefor mandatory for sb2 2.0. release :)
Only lightly tested but appears to work as expected.
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
| -rw-r--r-- | lua_scripts/argvenvp.lua | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lua_scripts/argvenvp.lua b/lua_scripts/argvenvp.lua index 0c273a3..cbb8a52 100644 --- a/lua_scripts/argvenvp.lua +++ b/lua_scripts/argvenvp.lua @@ -606,17 +606,22 @@ function sb_execve_postprocess_cpu_transparency_executable(rule, exec_policy, local new_argv = {} local new_filename = sbox_cputransparency_method - new_argv[1] = sbox_cputransparency_method + table.insert(new_argv, sbox_cputransparency_method) -- drop LD_PRELOAD env.var. - new_argv[2] = "-drop-ld-preload" + if conf_cputransparency_qemu_has_env_control_flags then + table.insert(new_argv, "-U") + table.insert(new_argv, "LD_PRELOAD") + else + table.insert(new_argv, "-drop-ld-preload") + end -- target runtime linker comes from / - new_argv[3] = "-L" - new_argv[4] = "/" + table.insert(new_argv, "-L") + table.insert(new_argv, "/") if conf_cputransparency_has_argv0_flag then -- set target argv[0] - new_argv[5] = "-0" - new_argv[6] = argv[1] + table.insert(new_argv, "-0") + table.insert(new_argv, argv[1]) end if conf_cputransparency_qemu_has_libattr_hack_flag then @@ -634,7 +639,7 @@ function sb_execve_postprocess_cpu_transparency_executable(rule, exec_policy, -- drop LD_TRACE_ from target environment if not string.match(envp[i], "^LD_TRACE_.*") then table.insert(new_envp, envp[i]) - else + else -- .. and move it to qemu command line table.insert(new_argv, "-E") table.insert(new_argv, envp[i]) |