22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
317 lines
8.2 KiB
C
317 lines
8.2 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Rexec program for system have fork() as vfork() with foreground option
|
|
*
|
|
* Copyright (C) Vladimir N. Oleynik <dzo@simtreas.ru>
|
|
* Copyright (C) 2003 Russ Dill <Russ.Dill@asu.edu>
|
|
*
|
|
* daemon() portion taken from uClibc:
|
|
*
|
|
* Copyright (c) 1991, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Modified for uClibc by Erik Andersen <andersee@debian.org>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
#include <sys/prctl.h>
|
|
#ifndef PR_SET_NAME
|
|
#define PR_SET_NAME 15
|
|
#endif
|
|
#ifndef PR_GET_NAME
|
|
#define PR_GET_NAME 16
|
|
#endif
|
|
|
|
#include "busybox.h" /* uses applet tables */
|
|
#include "NUM_APPLETS.h"
|
|
|
|
#define NOFORK_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_NOFORK))
|
|
#define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE))
|
|
|
|
#if defined(__linux__) && (NUM_APPLETS > 1)
|
|
void FAST_FUNC set_task_comm(const char *comm)
|
|
{
|
|
/* okay if too long (truncates) */
|
|
prctl(PR_SET_NAME, (long)comm, 0, 0, 0);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* NOFORK/NOEXEC support
|
|
*/
|
|
#if NOFORK_SUPPORT
|
|
static jmp_buf die_jmp;
|
|
static void jump(void)
|
|
{
|
|
/* Special case. We arrive here if NOFORK applet
|
|
* calls xfunc, which then decides to die.
|
|
* We don't die, but instead jump back to caller.
|
|
* NOFORK applets still cannot carelessly call xfuncs:
|
|
* p = xmalloc(10);
|
|
* q = xmalloc(10); // BUG! if this dies, we leak p!
|
|
*/
|
|
/* | 0x100 allows to pass zero exitcode (longjmp can't pass 0).
|
|
* This works because exitcodes are bytes,
|
|
* run_nofork_applet() ensures that by "& 0xff"
|
|
*/
|
|
longjmp(die_jmp, xfunc_error_retval | 0x100);
|
|
}
|
|
|
|
struct nofork_save_area {
|
|
jmp_buf die_jmp;
|
|
void (*die_func)(void);
|
|
const char *applet_name;
|
|
uint32_t option_mask32;
|
|
smallint logmode;
|
|
uint8_t xfunc_error_retval;
|
|
};
|
|
static void save_nofork_data(struct nofork_save_area *save)
|
|
{
|
|
memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
|
|
save->die_func = die_func;
|
|
save->applet_name = applet_name;
|
|
save->option_mask32 = option_mask32;
|
|
save->logmode = logmode;
|
|
save->xfunc_error_retval = xfunc_error_retval;
|
|
}
|
|
static void restore_nofork_data(struct nofork_save_area *save)
|
|
{
|
|
memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
|
|
die_func = save->die_func;
|
|
applet_name = save->applet_name;
|
|
option_mask32 = save->option_mask32;
|
|
logmode = save->logmode;
|
|
xfunc_error_retval = save->xfunc_error_retval;
|
|
}
|
|
|
|
int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
|
|
{
|
|
int rc, argc;
|
|
struct nofork_save_area old;
|
|
|
|
save_nofork_data(&old);
|
|
|
|
logmode = LOGMODE_STDIO;
|
|
xfunc_error_retval = EXIT_FAILURE;
|
|
/* In case getopt() was already called:
|
|
* reset the libc getopt() function, which keeps internal state.
|
|
* (getopt32() does it itself, but getopt() doesn't (and can't))
|
|
*/
|
|
GETOPT_RESET();
|
|
|
|
argc = string_array_len(argv);
|
|
|
|
/* If xfunc "dies" in NOFORK applet, die_func longjmp's here instead */
|
|
die_func = jump;
|
|
rc = setjmp(die_jmp);
|
|
if (!rc) {
|
|
/* Some callers (xargs)
|
|
* need argv untouched because they free argv[i]! */
|
|
char *tmp_argv[argc+1];
|
|
memcpy(tmp_argv, argv, (argc+1) * sizeof(tmp_argv[0]));
|
|
applet_name = tmp_argv[0];
|
|
/* Finally we can call NOFORK applet's main() */
|
|
rc = applet_main[applet_no](argc, tmp_argv);
|
|
/* Important for shells: `which CMD` was failing */
|
|
fflush_all();
|
|
} else {
|
|
/* xfunc died in NOFORK applet */
|
|
}
|
|
|
|
/* Restoring some globals */
|
|
restore_nofork_data(&old);
|
|
/* Other globals can be simply reset to defaults */
|
|
GETOPT_RESET();
|
|
|
|
return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
|
|
}
|
|
#endif
|
|
|
|
#if NOEXEC_SUPPORT
|
|
void FAST_FUNC run_noexec_applet_and_exit(int a, const char *name, char **argv)
|
|
{
|
|
/* reset some state and run without execing */
|
|
/* msg_eol = "\n"; - no caller needs this reinited yet */
|
|
logmode = LOGMODE_STDIO;
|
|
xfunc_error_retval = EXIT_FAILURE;
|
|
die_func = NULL;
|
|
GETOPT_RESET();
|
|
|
|
//TODO: think pidof, pgrep, pkill!
|
|
//set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
|
|
//but one from procps-ng-3.3.10 needs more!
|
|
//Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
|
|
set_task_comm(name);
|
|
/* applet_name is set by this function: */
|
|
run_applet_no_and_exit(a, name, argv);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Higher-level code, hiding optional NOFORK/NOEXEC trickery.
|
|
*/
|
|
|
|
/* This does a fork/exec in one call, using vfork(). Returns PID of new child,
|
|
* -1 for failure. Runs argv[0], searching path if that has no / in it. */
|
|
pid_t FAST_FUNC spawn(char **argv)
|
|
{
|
|
/* Compiler should not optimize stores here */
|
|
volatile int failed;
|
|
pid_t pid;
|
|
|
|
fflush_all();
|
|
|
|
/* Be nice to nommu machines. */
|
|
failed = 0;
|
|
pid = vfork();
|
|
if (pid < 0) /* error */
|
|
return pid;
|
|
if (!pid) { /* child */
|
|
/* This macro is ok - it doesn't do NOEXEC/NOFORK tricks */
|
|
BB_EXECVP(argv[0], argv);
|
|
|
|
/* We are (maybe) sharing a stack with blocked parent,
|
|
* let parent know we failed and then exit to unblock parent
|
|
* (but don't run atexit() stuff, which would screw up parent.)
|
|
*/
|
|
failed = errno;
|
|
/* mount, for example, does not want the message */
|
|
/*bb_perror_msg("can't execute '%s'", argv[0]);*/
|
|
_exit(111);
|
|
}
|
|
/* parent */
|
|
/* Unfortunately, this is not reliable: according to standards
|
|
* vfork() can be equivalent to fork() and we won't see value
|
|
* of 'failed'.
|
|
* Interested party can wait on pid and learn exit code.
|
|
* If 111 - then it (most probably) failed to exec */
|
|
if (failed) {
|
|
safe_waitpid(pid, NULL, 0); /* prevent zombie */
|
|
errno = failed;
|
|
return -1;
|
|
}
|
|
return pid;
|
|
}
|
|
|
|
/* Die with an error message if we can't spawn a child process. */
|
|
pid_t FAST_FUNC xspawn(char **argv)
|
|
{
|
|
pid_t pid = spawn(argv);
|
|
if (pid < 0)
|
|
bb_simple_perror_msg_and_die(*argv);
|
|
return pid;
|
|
}
|
|
|
|
int FAST_FUNC spawn_and_wait(char **argv)
|
|
{
|
|
int rc;
|
|
#if ENABLE_FEATURE_PREFER_APPLETS && (NUM_APPLETS > 1)
|
|
int a = find_applet_by_name(argv[0]);
|
|
|
|
if (a >= 0) {
|
|
if (APPLET_IS_NOFORK(a))
|
|
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 */
|
|
run_noexec_applet_and_exit(a, argv[0], argv);
|
|
}
|
|
# endif
|
|
}
|
|
#endif
|
|
rc = spawn(argv);
|
|
return wait4pid(rc);
|
|
}
|
|
|
|
#if !BB_MMU
|
|
void FAST_FUNC re_exec(char **argv)
|
|
{
|
|
/* high-order bit of first char in argv[0] is a hidden
|
|
* "we have (already) re-execed, don't do it again" flag */
|
|
argv[0][0] |= 0x80;
|
|
execv(bb_busybox_exec_path, argv);
|
|
bb_perror_msg_and_die("can't execute '%s'", bb_busybox_exec_path);
|
|
}
|
|
|
|
pid_t FAST_FUNC fork_or_rexec(char **argv)
|
|
{
|
|
pid_t pid;
|
|
/* Maybe we are already re-execed and come here again? */
|
|
if (re_execed)
|
|
return 0;
|
|
|
|
/* fflush_all(); ? - so far all callers had no buffered output to flush */
|
|
|
|
pid = xvfork();
|
|
if (pid) /* parent */
|
|
return pid;
|
|
/* child - re-exec ourself */
|
|
re_exec(argv);
|
|
}
|
|
#endif
|
|
|
|
/* Due to a #define in libbb.h on MMU systems we actually have 1 argument -
|
|
* char **argv "vanishes" */
|
|
void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
|
|
{
|
|
int fd;
|
|
|
|
if (flags & DAEMON_CHDIR_ROOT)
|
|
xchdir("/");
|
|
|
|
if (flags & DAEMON_DEVNULL_STDIO) {
|
|
close(0);
|
|
close(1);
|
|
close(2);
|
|
}
|
|
|
|
fd = open(bb_dev_null, O_RDWR);
|
|
if (fd < 0) {
|
|
/* NB: we can be called as bb_sanitize_stdio() from init
|
|
* or mdev, and there /dev/null may legitimately not (yet) exist!
|
|
* Do not use xopen above, but obtain _ANY_ open descriptor,
|
|
* even bogus one as below. */
|
|
fd = xopen("/", O_RDONLY); /* don't believe this can fail */
|
|
}
|
|
|
|
while ((unsigned)fd < 2)
|
|
fd = dup(fd); /* have 0,1,2 open at least to /dev/null */
|
|
|
|
if (!(flags & DAEMON_ONLY_SANITIZE)) {
|
|
|
|
/* fflush_all(); - add it in fork_or_rexec() if necessary */
|
|
|
|
if (fork_or_rexec(argv))
|
|
_exit(EXIT_SUCCESS); /* parent */
|
|
/* if daemonizing, detach from stdio & ctty */
|
|
setsid();
|
|
dup2(fd, 0);
|
|
dup2(fd, 1);
|
|
dup2(fd, 2);
|
|
if (flags & DAEMON_DOUBLE_FORK) {
|
|
/* On Linux, session leader can acquire ctty
|
|
* unknowingly, by opening a tty.
|
|
* Prevent this: stop being a session leader.
|
|
*/
|
|
if (fork_or_rexec(argv))
|
|
_exit(EXIT_SUCCESS); /* parent */
|
|
}
|
|
}
|
|
while (fd > 2) {
|
|
close(fd--);
|
|
if (!(flags & DAEMON_CLOSE_EXTRA_FDS))
|
|
return;
|
|
/* else close everything after fd#2 */
|
|
}
|
|
}
|
|
|
|
void FAST_FUNC bb_sanitize_stdio(void)
|
|
{
|
|
bb_daemonize_or_rexec(DAEMON_ONLY_SANITIZE, NULL);
|
|
}
|