proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 07:15:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix wait status in pid reuse case

Browse Source 
Commit 37c3dfc9 sets the wait status on only the child pid. It
intended to match the pid only once to protect against pid reuse but it
won't because the indicator was reset to 0 every time at the top of the
loop. If the child pid is reused, the wait status will be set again.
Fix by setting indicator outside the loop.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Dwight Engen 2013-04-08 12:45:23 -04:00 committed by Serge Hallyn
parent 1354f95287
commit fe19f236a2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/lxc_init.c
View File

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
int err = -1; int err = -1;
char **aargv; char **aargv;
sigset_t mask, omask; sigset_t mask, omask;
int i, shutdown = 0; int i, have_status = 0, shutdown = 0;
while (1) { while (1) {
int ret = getopt_long_only(argc, argv, "", options, NULL); int ret = getopt_long_only(argc, argv, "", options, NULL);
@ -162,7 +162,6 @@ int main(int argc, char *argv[])
err = 0; err = 0;
for (;;) { for (;;) {
int status; int status;
int orphan = 0;
pid_t waited_pid; pid_t waited_pid;
switch (was_interrupted) { switch (was_interrupted) {
@ -209,10 +208,10 @@ int main(int argc, char *argv[])
* (not wrapped pid) and continue to wait for * (not wrapped pid) and continue to wait for
* the end of the orphan group. * the end of the orphan group.
*/ */
if ((waited_pid != pid) || (orphan ==1)) if (waited_pid == pid && !have_status) {
continue; err = lxc_error_set_and_log(waited_pid, status);
orphan = 1; have_status = 1;
err = lxc_error_set_and_log(waited_pid, status); }
} }
out: out:
return err; return err;