From: Felix Abecassis <fabecassis@nvidia.com>
Date: Thu, 4 Apr 2019 04:09:53 +0000 (-0700)
Subject: Fix user namespace pdeathsig handling
X-Git-Tag: lxc-3.2.0~108^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08a5cc4fc3850ec245a88ce13ace39f77a34ff9;p=thirdparty%2Flxc.git

Fix user namespace pdeathsig handling

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 139f42963..793bf816a 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1190,7 +1190,7 @@ static int do_start(void *data)
 			goto out_warn_father;
 
 		/* set{g,u}id() clears deathsignal */
-		ret = lxc_set_death_signal(SIGKILL, 0);
+		ret = lxc_set_death_signal(SIGKILL, handler->monitor_pid);
 		if (ret < 0) {
 			SYSERROR("Failed to set PR_SET_PDEATHSIG to SIGKILL");
 			goto out_warn_father;