1*053f45beSAndroid Build Coastguard WorkerFrom c64fa51fbdabea40dedfbd3a86aee5a2e7ba460c Mon Sep 17 00:00:00 2001 2*053f45beSAndroid Build Coastguard WorkerFrom: Steve Muckle <[email protected]> 3*053f45beSAndroid Build Coastguard WorkerDate: Mon, 9 Oct 2017 15:06:34 -0700 4*053f45beSAndroid Build Coastguard WorkerSubject: [PATCH 07/20] execveat: use /system/bin/sh 5*053f45beSAndroid Build Coastguard Worker 6*053f45beSAndroid Build Coastguard WorkerThe Android shell is located at /system/bin/sh. 7*053f45beSAndroid Build Coastguard Worker 8*053f45beSAndroid Build Coastguard Worker(cherry picked from commit 860cea0bba7f78cf4cbb78251849e6ef159e6914) 9*053f45beSAndroid Build Coastguard WorkerBug: 67016227 10*053f45beSAndroid Build Coastguard WorkerTest: run vts-kernel -m VtsKernelLinuxKselftestStaging 11*053f45beSAndroid Build Coastguard WorkerSigned-off-by: Steve Muckle <[email protected]> 12*053f45beSAndroid Build Coastguard Worker--- 13*053f45beSAndroid Build Coastguard Worker tools/testing/selftests/exec/execveat.c | 2 +- 14*053f45beSAndroid Build Coastguard Worker 1 file changed, 1 insertion(+), 1 deletion(-) 15*053f45beSAndroid Build Coastguard Worker 16*053f45beSAndroid Build Coastguard Workerdiff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c 17*053f45beSAndroid Build Coastguard Workerindex 67bf7254a48f..ecc974e75a9b 100644 18*053f45beSAndroid Build Coastguard Worker--- a/tools/testing/selftests/exec/execveat.c 19*053f45beSAndroid Build Coastguard Worker+++ b/tools/testing/selftests/exec/execveat.c 20*053f45beSAndroid Build Coastguard Worker@@ -379,7 +379,7 @@ static int run_tests(void) 21*053f45beSAndroid Build Coastguard Worker static void prerequisites(void) 22*053f45beSAndroid Build Coastguard Worker { 23*053f45beSAndroid Build Coastguard Worker int fd; 24*053f45beSAndroid Build Coastguard Worker- const char *script = "#!/bin/sh\nexit $*\n"; 25*053f45beSAndroid Build Coastguard Worker+ const char *script = "#!/system/bin/sh\nexit $*\n"; 26*053f45beSAndroid Build Coastguard Worker 27*053f45beSAndroid Build Coastguard Worker /* Create ephemeral copies of files */ 28*053f45beSAndroid Build Coastguard Worker exe_cp("execveat", "execveat.ephemeral"); 29*053f45beSAndroid Build Coastguard Worker-- 30*053f45beSAndroid Build Coastguard Worker2.42.0.609.gbb76f46606-goog 31*053f45beSAndroid Build Coastguard Worker 32