emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: spawn_and_wait() fflushes before forking NOEXEC; child reinits logmode

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-01-26 01:13:58 +01:00
parent 06f20bf675
commit 9967c9949e
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libbb/vfork_daemon_rexec.c
View File

@ -183,26 +183,28 @@ int FAST_FUNC spawn_and_wait(char **argv)
#if ENABLE_FEATURE_PREFER_APPLETS
int a = find_applet_by_name(argv[0]);
if (a >= 0 && (APPLET_IS_NOFORK(a)
# if BB_MMU
|| APPLET_IS_NOEXEC(a) /* NOEXEC trick needs fork() */
# endif
)) {
# if BB_MMU
if (a >= 0) {
if (APPLET_IS_NOFORK(a))
# endif
{
return run_nofork_applet(a, argv);
# if BB_MMU /* NOEXEC needs fork(), thus this is done only on MMU machines: */
if (APPLET_IS_NOEXEC(a)) {
fflush_all();
rc = fork();
if (rc) /* parent or error */
return wait4pid(rc);
/* child */
/* reset some state and run without execing */
/* msg_eol = "\n"; - no caller needs this reinited yet */
logmode = LOGMODE_STDIO;
/* die_func = NULL; - needed if the caller is a shell,
* init, or a NOFORK applet. But none of those call us
* as of yet (and that should probably always stay true).
*/
/* xfunc_error_retval and applet_name are init by: */
run_applet_no_and_exit(a, argv);
}
# if BB_MMU
/* MMU only */
/* a->noexec is true */
rc = fork();
if (rc) /* parent or error */
return wait4pid(rc);
/* child */
xfunc_error_retval = EXIT_FAILURE;
run_applet_no_and_exit(a, argv);
# endif
}
#endif /* FEATURE_PREFER_APPLETS */