mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

test-container: move postclean outside of namespace changes

Browse Source 
During postclean.req testing it was found that the fork in the
parent process (after the unshare syscall) would fail with ENOMEM
(see recursive_remove() in test-container.c).  While failing with
ENOMEM is certainly unexpected, it is simply easier to refactor
the design and have the parent remain outside of the namespace.
This change moves the postclean.req processing to a distinct
process (the parent) that then forks the test process (which will
have to fork once more to complete uid/gid transitions). When the
test process exists the cleanup process will ensure all files are
deleted when a post clean is requested.

Signed-off-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>

[BZ #23948]
* support/test-container.c: Move postclean step to before we
change namespaces.
This commit is contained in:
DJ Delorie 2018-12-05 12:39:47 -05:00
parent cb7be1590e
commit 304c61a24f
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2018-12-10 DJ Delorie <dj@redhat.com>
[BZ #23948]
* support/test-container.c: Move postclean step to before we
change namespaces.
2018-12-10 Joseph Myers <joseph@codesourcery.com> 2018-12-10 Joseph Myers <joseph@codesourcery.com>
* scripts/gen-as-const.py (main): Handle --python option. * scripts/gen-as-const.py (main): Handle --python option.

45
support/test-container.c
View File

@ -921,6 +921,43 @@ main (int argc, char **argv)
} }
} }
if (do_postclean)
{
pid_t pc_pid = fork ();
if (pc_pid < 0)
{
FAIL_EXIT1 ("Can't fork for post-clean");
}
else if (pc_pid > 0)
{
/* Parent. */
int status;
waitpid (pc_pid, &status, 0);
/* Child has exited, we can post-clean the test root. */
printf("running post-clean rsync\n");
rsync (pristine_root_path, new_root_path, 1);
if (WIFEXITED (status))
exit (WEXITSTATUS (status));
if (WIFSIGNALED (status))
{
printf ("%%SIGNALLED%%\n");
exit (77);
}
printf ("%%EXITERROR%%\n");
exit (78);
}
/* Child continues. */
}
/* This is the last point in the program where we're still in the
"normal" namespace. */
#ifdef CLONE_NEWNS #ifdef CLONE_NEWNS
/* The unshare here gives us our own spaces and capabilities. */ /* The unshare here gives us our own spaces and capabilities. */
if (unshare (CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNS) < 0) if (unshare (CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNS) < 0)
@ -974,14 +1011,6 @@ main (int argc, char **argv)
int status; int status;
waitpid (child, &status, 0); waitpid (child, &status, 0);
/* There's a bit of magic here, since the buildroot is mounted
in our space, the paths are still valid, and since the mounts
aren't recursive, it sees *only* the built root, not anything
we would normally se if we rsync'd to "/" like mounted /dev
files. */
if (do_postclean)
rsync (pristine_root_path, new_root_path, 1);
if (WIFEXITED (status)) if (WIFEXITED (status))
exit (WEXITSTATUS (status)); exit (WEXITSTATUS (status));