Merge pull request #2677 from brauner/2018-10-07/attach_reset_signal_mask

attach: reset signal mask

Merge pull request #2677 from brauner/2018-10-07/attach_reset_signal_mask
8f355cad · Stéphane Graber · GitHub · acf67bc9 · f157b056 · 8f355cad
Unverified Commit 8f355cad authored Oct 07, 2018 by Stéphane Graber Committed by GitHub Oct 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

attach.c src/lxc/attach.c +9 -0

No files found.
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -1483,6 +1483,15 @@ int lxc_attach(const char *name, const char *lxcpath,
 	}

 	if (pid == 0) {
+		if (options->attach_flags & LXC_ATTACH_TERMINAL) {
+			ret = pthread_sigmask(SIG_SETMASK,
+					      &terminal.tty_state->oldmask, NULL);
+			if (ret < 0) {
+				SYSERROR("Failed to reset signal mask");
+				_exit(EXIT_FAILURE);
+			}
+		}
+
 		ret = attach_child_main(&payload);
 		if (ret < 0)
 			ERROR("Failed to exec");