diff options
author | Allen Webb <allenwebb@google.com> | 2022-03-21 17:54:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 17:54:27 +0000 |
commit | e564e85bec97725a7a243d82b4bd83d931257fd4 (patch) | |
tree | f74ab1d48e2f18d65348c06014c4fa138e1857ab | |
parent | a8485bef11b7d201f117c2c5a83720dbe84d287b (diff) | |
parent | c4dbc7cde890d7ddc031e117d0fca40c8f02fe0c (diff) | |
download | minijail-e564e85bec97725a7a243d82b4bd83d931257fd4.tar.gz |
libminijail: Set the controlling tty if appropriate. am: f486e262fa am: c4dbc7cde8
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2032023
Change-Id: Icd58c80db8c93d806c367d50521985aece187244
-rw-r--r-- | libminijail.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libminijail.c b/libminijail.c index ea59404..aab1294 100644 --- a/libminijail.c +++ b/libminijail.c @@ -2889,6 +2889,12 @@ static void setup_child_std_fds(struct minijail *j, if (setsid() < 0) { pdie("setsid() failed"); } + + if (isatty(STDIN_FILENO)) { + if (ioctl(STDIN_FILENO, TIOCSCTTY, 0) != 0) { + pwarn("failed to set controlling terminal"); + } + } } } @@ -2943,12 +2949,12 @@ int API minijail_run_env(struct minijail *j, const char *filename, char *const argv[], char *const envp[]) { struct minijail_run_config config = { - .filename = filename, - .elf_fd = -1, - .argv = argv, - .envp = envp, - .use_preload = true, - .exec_in_child = true, + .filename = filename, + .elf_fd = -1, + .argv = argv, + .envp = envp, + .use_preload = true, + .exec_in_child = true, }; return minijail_run_config_internal(j, &config); } |