From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Jan 2022 12:55:30 +0000 (+0100)
Subject: Merge branch 'sys-utils-unshare-pdeathsig-race' of https://github.com/earlchew/util... 
X-Git-Tag: v2.38-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d671858894163144f10b528ef05c11d045b8e0;p=thirdparty%2Futil-linux.git

Merge branch 'sys-utils-unshare-pdeathsig-race' of https://github.com/earlchew/util-linux

* 'sys-utils-unshare-pdeathsig-race' of https://github.com/earlchew/util-linux:
  unshare: Fix PDEATHSIG race for --kill-child
---

12d671858894163144f10b528ef05c11d045b8e0
diff --cc sys-utils/unshare.c
index 70dead1b6d,2dbab9161a..443358952b
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@@ -763,9 -763,8 +763,9 @@@ int main(int argc, char *argv[]
  	const char *newroot = NULL;
  	const char *newdir = NULL;
  	pid_t pid_bind = 0, pid_idmap = 0;
- 	pid_t pid = 0;
+ 	pid_t pid = 0, pid_parent = 0;
  	int fd_idmap, fd_bind = -1;
 +	sigset_t sigset, oldsigset;
  	int status;
  	unsigned long propagation = UNSHARE_PROPAGATION_DEFAULT;
  	int force_uid = 0, force_gid = 0;