X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Fappletlib.c;h=a515c3fe3db2f49fd075c27b25eec66dc87d2d0a;hb=HEAD;hp=3e32fa1efdece46be7d29ad5d84668b3f7666494;hpb=8da415ef2503936bc9730f78a25b00177ff2db1d;p=oweals%2Fbusybox.git diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 3e32fa1ef..a515c3fe3 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -11,7 +11,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* We are trying to not use printf, this benefits the case when selected * applets are really simple. Example: * @@ -27,27 +26,18 @@ * FEATURE_INSTALLER or FEATURE_SUID will still link printf routines in. :( */ #include "busybox.h" -#include + #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ - || defined(__APPLE__) \ + || defined(__APPLE__) \ ) # include /* for mallopt */ #endif -/* Try to pull in PAGE_SIZE */ -#ifdef __linux__ -# include -#endif -#ifdef __GNU__ /* Hurd */ -# include -#endif - /* Declare _main() */ #define PROTOTYPES #include "applets.h" #undef PROTOTYPES - /* Include generated applet names, pointers to _main, etc */ #include "applet_tables.h" /* ...and if applet_tables generator says we have only one applet... */ @@ -58,9 +48,55 @@ # define IF_FEATURE_INDIVIDUAL(...) __VA_ARGS__ #endif - #include "usage_compressed.h" +#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS +# define DEFINE_SCRIPT_DATA 1 +# include "embedded_scripts.h" +#else +# define NUM_SCRIPTS 0 +#endif +#if NUM_SCRIPTS > 0 +# include "bb_archive.h" +static const char packed_scripts[] ALIGN1 = { PACKED_SCRIPTS }; +#endif + +/* "Do not compress usage text if uncompressed text is small + * and we don't include bunzip2 code for other reasons" + * + * Useful for mass one-applet rebuild (bunzip2 code is ~2.7k). + * + * Unlike BUNZIP2, if FEATURE_SEAMLESS_BZ2 is on, bunzip2 code is built but + * still may be unused if none of the selected applets calls open_zipped() + * or its friends; we test for (FEATURE_SEAMLESS_BZ2 && ) instead. + * For example, only if TAR and FEATURE_SEAMLESS_BZ2 are both selected, + * then bunzip2 code will be linked in anyway, and disabling help compression + * would be not optimal: + */ +#if UNPACKED_USAGE_LENGTH < 4*1024 \ + && !(ENABLE_FEATURE_SEAMLESS_BZ2 && ENABLE_TAR) \ + && !(ENABLE_FEATURE_SEAMLESS_BZ2 && ENABLE_MODPROBE) \ + && !(ENABLE_FEATURE_SEAMLESS_BZ2 && ENABLE_INSMOD) \ + && !(ENABLE_FEATURE_SEAMLESS_BZ2 && ENABLE_DEPMOD) \ + && !(ENABLE_FEATURE_SEAMLESS_BZ2 && ENABLE_MAN) \ + && !ENABLE_BUNZIP2 \ + && !ENABLE_BZCAT +# undef ENABLE_FEATURE_COMPRESS_USAGE +# define ENABLE_FEATURE_COMPRESS_USAGE 0 +#endif + + +unsigned FAST_FUNC string_array_len(char **argv) +{ + char **start = argv; + + while (*argv) + argv++; + + return argv - start; +} + + #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE static const char usage_messages[] ALIGN1 = UNPACKED_USAGE; #else @@ -70,28 +106,9 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE; #if ENABLE_FEATURE_COMPRESS_USAGE static const char packed_usage[] ALIGN1 = { PACKED_USAGE }; -# include "archive.h" -static const char *unpack_usage_messages(void) -{ - char *outbuf = NULL; - bunzip_data *bd; - int i; - - i = start_bunzip(&bd, - /* src_fd: */ -1, - /* inbuf: */ packed_usage, - /* len: */ sizeof(packed_usage)); - /* read_bunzip can longjmp to start_bunzip, and ultimately - * end up here with i != 0 on read data errors! Not trivial */ - if (!i) { - /* Cannot use xmalloc: will leak bd in NOFORK case! */ - outbuf = malloc_or_warn(sizeof(UNPACKED_USAGE)); - if (outbuf) - read_bunzip(bd, outbuf, sizeof(UNPACKED_USAGE)); - } - dealloc_bunzip(bd); - return outbuf; -} +# include "bb_archive.h" +# define unpack_usage_messages() \ + unpack_bz2_data(packed_usage, sizeof(packed_usage), sizeof(UNPACKED_USAGE)) # define dealloc_usage_messages(s) free(s) #else @@ -106,39 +123,44 @@ void FAST_FUNC bb_show_usage(void) { if (ENABLE_SHOW_USAGE) { #ifdef SINGLE_APPLET_STR - /* Imagine that this applet is "true". Dont suck in printf! */ + /* Imagine that this applet is "true". Dont link in printf! */ const char *usage_string = unpack_usage_messages(); - if (*usage_string == '\b') { - full_write2_str("No help available.\n\n"); - } else { - full_write2_str("Usage: "SINGLE_APPLET_STR" "); - full_write2_str(usage_string); - full_write2_str("\n\n"); + if (usage_string) { + if (*usage_string == '\b') { + full_write2_str("No help available\n"); + } else { + full_write2_str("Usage: "SINGLE_APPLET_STR" "); + full_write2_str(usage_string); + full_write2_str("\n"); + } + if (ENABLE_FEATURE_CLEAN_UP) + dealloc_usage_messages((char*)usage_string); } - if (ENABLE_FEATURE_CLEAN_UP) - dealloc_usage_messages((char*)usage_string); #else const char *p; const char *usage_string = p = unpack_usage_messages(); int ap = find_applet_by_name(applet_name); - if (ap < 0) /* never happens, paranoia */ + if (ap < 0 || usage_string == NULL) xfunc_die(); while (ap) { while (*p++) continue; ap--; } full_write2_str(bb_banner); - full_write2_str(" multi-call binary.\n"); + full_write2_str(" multi-call binary.\n"); /* common string */ if (*p == '\b') - full_write2_str("\nNo help available.\n\n"); + full_write2_str("\nNo help available\n"); else { full_write2_str("\nUsage: "); full_write2_str(applet_name); - full_write2_str(" "); - full_write2_str(p); - full_write2_str("\n\n"); + if (p[0]) { + if (p[0] != '\n') + full_write2_str(" "); + full_write2_str(p); + } + full_write2_str("\n"); } if (ENABLE_FEATURE_CLEAN_UP) dealloc_usage_messages((char*)usage_string); @@ -147,31 +169,127 @@ void FAST_FUNC bb_show_usage(void) xfunc_die(); } -#if NUM_APPLETS > 8 -/* NB: any char pointer will work as well, not necessarily applet_names */ -static int applet_name_compare(const void *name, const void *v) -{ - int i = (const char *)v - applet_names; - return strcmp(name, APPLET_NAME(i)); -} -#endif int FAST_FUNC find_applet_by_name(const char *name) { -#if NUM_APPLETS > 8 - /* Do a binary search to find the applet entry given the name. */ + unsigned i, max; + int j; const char *p; - p = bsearch(name, applet_names, ARRAY_SIZE(applet_main), 1, applet_name_compare); - if (!p) - return -1; - return p - applet_names; + +/* The commented-out word-at-a-time code is ~40% faster, but +160 bytes. + * "Faster" here saves ~0.5 microsecond of real time - not worth it. + */ +#if 0 /*BB_UNALIGNED_MEMACCESS_OK && BB_LITTLE_ENDIAN*/ + uint32_t n32; + + /* Handle all names < 2 chars long early */ + if (name[0] == '\0') + return -1; /* "" is not a valid applet name */ + if (name[1] == '\0') { + if (!ENABLE_TEST) + return -1; /* 1-char name is not valid */ + if (name[0] != ']') + return -1; /* 1-char name which isn't "[" is not valid */ + /* applet "[" is always applet #0: */ + return 0; + } +#endif + + p = applet_names; + i = 0; +#if KNOWN_APPNAME_OFFSETS <= 0 + max = NUM_APPLETS; #else - /* A version which does not pull in bsearch */ - int i = 0; - const char *p = applet_names; - while (i < NUM_APPLETS) { - if (strcmp(name, p) == 0) + max = NUM_APPLETS * KNOWN_APPNAME_OFFSETS; + for (j = ARRAY_SIZE(applet_nameofs)-1; j >= 0; j--) { + const char *pp = applet_names + applet_nameofs[j]; + if (strcmp(name, pp) >= 0) { + //bb_error_msg("name:'%s' >= pp:'%s'", name, pp); + p = pp; + i = max - NUM_APPLETS; + break; + } + max -= NUM_APPLETS; + } + max /= (unsigned)KNOWN_APPNAME_OFFSETS; + i /= (unsigned)KNOWN_APPNAME_OFFSETS; + //bb_error_msg("name:'%s' starting from:'%s' i:%u max:%u", name, p, i, max); +#endif + + /* Open-coded linear search without strcmp/strlen calls for speed */ + +#if 0 /*BB_UNALIGNED_MEMACCESS_OK && BB_LITTLE_ENDIAN*/ + /* skip "[\0" name, it's surely not it */ + if (ENABLE_TEST && LONE_CHAR(p, '[')) + i++, p += 2; + /* All remaining applet names in p[] are at least 2 chars long */ + /* name[] is also at least 2 chars long */ + + n32 = (name[0] << 0) | (name[1] << 8) | (name[2] << 16); + while (i < max) { + uint32_t p32; + char ch; + + /* Quickly check match of the first 3 bytes */ + move_from_unaligned32(p32, p); + p += 3; + if ((p32 & 0x00ffffff) != n32) { + /* Most likely case: 3 first bytes do not match */ + i++; + if ((p32 & 0x00ff0000) == '\0') + continue; // p[2] was NUL + p++; + if ((p32 & 0xff000000) == '\0') + continue; // p[3] was NUL + /* p[0..3] aren't matching and none is NUL, check the rest */ + while (*p++ != '\0') + continue; + continue; + } + + /* Unlikely branch: first 3 bytes ([0..2]) match */ + if ((p32 & 0x00ff0000) == '\0') { + /* name is 2-byte long, it is full match */ + //bb_error_msg("found:'%s' i:%u", name, i); return i; - p += strlen(p) + 1; + } + /* Check remaining bytes [3..NUL] */ + ch = (p32 >> 24); + j = 3; + while (ch == name[j]) { + if (ch == '\0') { + //bb_error_msg("found:'%s' i:%u", name, i); + return i; + } + ch = *++p; + j++; + } + /* Not a match. Skip it, including NUL */ + while (ch != '\0') + ch = *++p; + p++; + i++; + } + return -1; +#else + while (i < max) { + char ch; + j = 0; + /* Do we see "name\0" in applet_names[p] position? */ + while ((ch = *p) == name[j]) { + if (ch == '\0') { + //bb_error_msg("found:'%s' i:%u", name, i); + return i; /* yes */ + } + p++; + j++; + } + /* No. + * p => 1st non-matching char in applet_names[], + * skip to and including NUL. + */ + while (ch != '\0') + ch = *++p; + p++; i++; } return -1; @@ -186,13 +304,12 @@ void lbb_prepare(const char *applet IF_FEATURE_INDIVIDUAL(, char **argv)) { #ifdef __GLIBC__ - (*(int **)&bb_errno) = __errno_location(); + (*(int **)not_const_pp(&bb_errno)) = __errno_location(); barrier(); #endif applet_name = applet; - /* Set locale for everybody except 'init' */ - if (ENABLE_LOCALE_SUPPORT && getpid() != 1) + if (ENABLE_LOCALE_SUPPORT) setlocale(LC_ALL, ""); #if ENABLE_FEATURE_INDIVIDUAL @@ -201,7 +318,7 @@ void lbb_prepare(const char *applet if (argv[1] && !argv[2] && strcmp(argv[1], "--help") == 0 - && strncmp(applet, "busybox", 7) != 0 + && !is_prefixed_with(applet, "busybox") ) { /* Special case. POSIX says "test --help" * should be no different from e.g. "test --foo". */ @@ -233,38 +350,17 @@ IF_FEATURE_SUID(static uid_t ruid;) /* real uid */ # if ENABLE_FEATURE_SUID_CONFIG -/* applets[] is const, so we have to define this "override" structure */ -static struct BB_suid_config { +static struct suid_config_t { + /* next ptr must be first: this struct needs to be llist-compatible */ + struct suid_config_t *m_next; + struct bb_uidgid_t m_ugid; int m_applet; - uid_t m_uid; - gid_t m_gid; mode_t m_mode; - struct BB_suid_config *m_next; } *suid_config; static bool suid_cfg_readable; -/* check if u is member of group g */ -static int ingroup(uid_t u, gid_t g) -{ - struct group *grp = getgrgid(g); - - if (grp) { - char **mem; - - for (mem = grp->gr_mem; *mem; mem++) { - struct passwd *pwd = getpwnam(*mem); - - if (pwd && (pwd->pw_uid == u)) - return 1; - } - } - return 0; -} - -/* This should probably be a libbb routine. In that case, - * I'd probably rename it to something like bb_trimmed_slice. - */ +/* libbb candidate */ static char *get_trimmed_slice(char *s, char *e) { /* First, consider the value at e to be nul and back up until we @@ -282,38 +378,19 @@ static char *get_trimmed_slice(char *s, char *e) return skip_whitespace(s); } -/* Don't depend on the tools to combine strings. */ -static const char config_file[] ALIGN1 = "/etc/busybox.conf"; - -/* We don't supply a value for the nul, so an index adjustment is - * necessary below. Also, we use unsigned short here to save some - * space even though these are really mode_t values. */ -static const unsigned short mode_mask[] ALIGN2 = { - /* SST sst xxx --- */ - S_ISUID, S_ISUID|S_IXUSR, S_IXUSR, 0, /* user */ - S_ISGID, S_ISGID|S_IXGRP, S_IXGRP, 0, /* group */ - 0, S_IXOTH, S_IXOTH, 0 /* other */ -}; - -#define parse_error(x) do { errmsg = x; goto pe_label; } while (0) - static void parse_config_file(void) { - struct BB_suid_config *sct_head; - struct BB_suid_config *sct; + /* Don't depend on the tools to combine strings. */ + static const char config_file[] ALIGN1 = "/etc/busybox.conf"; + + struct suid_config_t *sct_head; int applet_no; FILE *f; const char *errmsg; - char *s; - char *e; - int i; unsigned lc; smallint section; - char buffer[256]; struct stat st; - assert(!suid_config); /* Should be set to NULL by bss init. */ - ruid = getuid(); if (ruid == 0) /* run by root - don't need to even read config file */ return; @@ -322,7 +399,7 @@ static void parse_config_file(void) || !S_ISREG(st.st_mode) /* Not a regular file? */ || (st.st_uid != 0) /* Not owned by root? */ || (st.st_mode & (S_IWGRP | S_IWOTH)) /* Writable by non-root? */ - || !(f = fopen_for_read(config_file)) /* Cannot open? */ + || !(f = fopen_for_read(config_file)) /* Cannot open? */ ) { return; } @@ -332,18 +409,21 @@ static void parse_config_file(void) section = lc = 0; while (1) { - s = buffer; - - if (!fgets(s, sizeof(buffer), f)) { /* Are we done? */ -// why? - if (ferror(f)) { /* Make sure it wasn't a read error. */ - parse_error("reading"); - } + char buffer[256]; + char *s; + + if (!fgets(buffer, sizeof(buffer), f)) { /* Are we done? */ + // Looks like bloat + //if (ferror(f)) { /* Make sure it wasn't a read error. */ + // errmsg = "reading"; + // goto pe_label; + //} fclose(f); suid_config = sct_head; /* Success, so set the pointer. */ return; } + s = buffer; lc++; /* Got a (partial) line. */ /* If a line is too long for our buffer, we consider it an error. @@ -355,7 +435,8 @@ static void parse_config_file(void) * we do err on the side of caution. Besides, the line would be * too long if it did end with a newline. */ if (!strchr(s, '\n') && !feof(f)) { - parse_error("line too long"); + errmsg = "line too long"; + goto pe_label; } /* Trim leading and trailing whitespace, ignoring comments, and @@ -371,12 +452,13 @@ static void parse_config_file(void) /* Unlike the old code, we ignore leading and trailing * whitespace for the section name. We also require that * there are no stray characters after the closing bracket. */ - e = strchr(s, ']'); + char *e = strchr(s, ']'); if (!e /* Missing right bracket? */ || e[1] /* Trailing characters? */ || !*(s = get_trimmed_slice(s+1, e)) /* Missing name? */ ) { - parse_error("section header"); + errmsg = "section header"; + goto pe_label; } /* Right now we only have one section so just check it. * If more sections are added in the future, please don't @@ -401,12 +483,13 @@ static void parse_config_file(void) * where both key and value could contain inner whitespace. */ /* First get the key (an applet name in our case). */ - e = strchr(s, '='); + char *e = strchr(s, '='); if (e) { s = get_trimmed_slice(s, e); } if (!e || !*s) { /* Missing '=' or empty key. */ - parse_error("keyword"); + errmsg = "keyword"; + goto pe_label; } /* Ok, we have an applet name. Process the rhs if this @@ -415,13 +498,16 @@ static void parse_config_file(void) * up when the busybox configuration is changed. */ applet_no = find_applet_by_name(s); if (applet_no >= 0) { + unsigned i; + struct suid_config_t *sct; + /* Note: We currently don't check for duplicates! * The last config line for each applet will be the * one used since we insert at the head of the list. * I suppose this could be considered a feature. */ - sct = xmalloc(sizeof(struct BB_suid_config)); + sct = xzalloc(sizeof(*sct)); sct->m_applet = applet_no; - sct->m_mode = 0; + /*sct->m_mode = 0;*/ sct->m_next = sct_head; sct_head = sct; @@ -430,48 +516,41 @@ static void parse_config_file(void) e = skip_whitespace(e+1); for (i = 0; i < 3; i++) { - /* There are 4 chars + 1 nul for each of user/group/other. */ - static const char mode_chars[] ALIGN1 = "Ssx-\0" "Ssx-\0" "Ttx-"; - - const char *q; - q = strchrnul(mode_chars + 5*i, *e++); - if (!*q) { - parse_error("mode"); + /* There are 4 chars for each of user/group/other. + * "x-xx" instead of "x-" are to make + * "idx > 3" check catch invalid chars. + */ + static const char mode_chars[] ALIGN1 = "Ssx-" "Ssx-" "x-xx"; + static const unsigned short mode_mask[] ALIGN2 = { + S_ISUID, S_ISUID|S_IXUSR, S_IXUSR, 0, /* Ssx- */ + S_ISGID, S_ISGID|S_IXGRP, S_IXGRP, 0, /* Ssx- */ + S_IXOTH, 0 /* x- */ + }; + const char *q = strchrnul(mode_chars + 4*i, *e); + unsigned idx = q - (mode_chars + 4*i); + if (idx > 3) { + errmsg = "mode"; + goto pe_label; } - /* Adjust by -i to account for nul. */ - sct->m_mode |= mode_mask[(q - mode_chars) - i]; + sct->m_mode |= mode_mask[q - mode_chars]; + e++; } - /* Now get the the user/group info. */ + /* Now get the user/group info. */ s = skip_whitespace(e); - - /* Note: we require whitespace between the mode and the - * user/group info. */ - if ((s == e) || !(e = strchr(s, '.'))) { - parse_error("."); - } - *e++ = '\0'; - - /* We can't use get_ug_id here since it would exit() - * if a uid or gid was not found. Oh well... */ - sct->m_uid = bb_strtoul(s, NULL, 10); - if (errno) { - struct passwd *pwd = getpwnam(s); - if (!pwd) { - parse_error("user"); + /* Default is 0.0, else parse USER.GROUP: */ + if (*s) { + /* We require whitespace between mode and USER.GROUP */ + if ((s == e) || !(e = strchr(s, '.'))) { + errmsg = "uid.gid"; + goto pe_label; } - sct->m_uid = pwd->pw_uid; - } - - sct->m_gid = bb_strtoul(e, NULL, 10); - if (errno) { - struct group *grp; - grp = getgrnam(e); - if (!grp) { - parse_error("group"); + *e = ':'; /* get_uidgid needs USER:GROUP syntax */ + if (get_uidgid(&sct->m_ugid, s) == 0) { + errmsg = "unknown user/group"; + goto pe_label; } - sct->m_gid = grp->gr_gid; } } continue; @@ -485,22 +564,17 @@ static void parse_config_file(void) * We may want to simply ignore such lines in case they * are used in some future version of busybox. */ if (!section) { - parse_error("keyword outside section"); + errmsg = "keyword outside section"; + goto pe_label; } - } /* while (1) */ pe_label: - fprintf(stderr, "Parse error in %s, line %d: %s\n", - config_file, lc, errmsg); - fclose(f); + bb_error_msg("parse error in %s, line %u: %s", config_file, lc, errmsg); + /* Release any allocated memory before returning. */ - while (sct_head) { - sct = sct_head->m_next; - free(sct_head); - sct_head = sct; - } + llist_free((llist_t*)sct_head, NULL); } # else static inline void parse_config_file(void) @@ -510,7 +584,24 @@ static inline void parse_config_file(void) # endif /* FEATURE_SUID_CONFIG */ -# if ENABLE_FEATURE_SUID +# if ENABLE_FEATURE_SUID && NUM_APPLETS > 0 +# if ENABLE_FEATURE_SUID_CONFIG +/* check if u is member of group g */ +static int ingroup(uid_t u, gid_t g) +{ + struct group *grp = getgrgid(g); + if (grp) { + char **mem; + for (mem = grp->gr_mem; *mem; mem++) { + struct passwd *pwd = getpwnam(*mem); + if (pwd && (pwd->pw_uid == u)) + return 1; + } + } + return 0; +} +# endif + static void check_suid(int applet_no) { gid_t rgid; /* real gid */ @@ -522,7 +613,7 @@ static void check_suid(int applet_no) # if ENABLE_FEATURE_SUID_CONFIG if (suid_cfg_readable) { uid_t uid; - struct BB_suid_config *sct; + struct suid_config_t *sct; mode_t m; for (sct = suid_config; sct; sct = sct->m_next) { @@ -531,36 +622,40 @@ static void check_suid(int applet_no) } goto check_need_suid; found: + /* Is this user allowed to run this applet? */ m = sct->m_mode; - if (sct->m_uid == ruid) + if (sct->m_ugid.uid == ruid) /* same uid */ m >>= 6; - else if ((sct->m_gid == rgid) || ingroup(ruid, sct->m_gid)) + else if ((sct->m_ugid.gid == rgid) || ingroup(ruid, sct->m_ugid.gid)) /* same group / in group */ m >>= 3; - - if (!(m & S_IXOTH)) /* is x bit not set ? */ - bb_error_msg_and_die("you have no permission to run this applet!"); - - /* _both_ sgid and group_exec have to be set for setegid */ - if ((sct->m_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) - rgid = sct->m_gid; - /* else (no setegid) we will set egid = rgid */ + if (!(m & S_IXOTH)) /* is x bit not set? */ + bb_simple_error_msg_and_die("you have no permission to run this applet"); /* We set effective AND saved ids. If saved-id is not set - * like we do below, seteiud(0) can still later succeed! */ + * like we do below, seteuid(0) can still later succeed! */ + + /* Are we directed to change gid + * (APPLET = *s* USER.GROUP or APPLET = *S* USER.GROUP)? + */ + if (sct->m_mode & S_ISGID) + rgid = sct->m_ugid.gid; + /* else: we will set egid = rgid, thus dropping sgid effect */ if (setresgid(-1, rgid, rgid)) - bb_perror_msg_and_die("setresgid"); + bb_simple_perror_msg_and_die("setresgid"); - /* do we have to set effective uid? */ + /* Are we directed to change uid + * (APPLET = s** USER.GROUP or APPLET = S** USER.GROUP)? + */ uid = ruid; if (sct->m_mode & S_ISUID) - uid = sct->m_uid; - /* else (no seteuid) we will set euid = ruid */ - + uid = sct->m_ugid.uid; + /* else: we will set euid = ruid, thus dropping suid effect */ if (setresuid(-1, uid, uid)) - bb_perror_msg_and_die("setresuid"); - return; + bb_simple_perror_msg_and_die("setresuid"); + + goto ret; } # if !ENABLE_FEATURE_SUID_CONFIG_QUIET { @@ -568,21 +663,38 @@ static void check_suid(int applet_no) if (!onetime) { onetime = 1; - fprintf(stderr, "Using fallback suid method\n"); + bb_simple_error_msg("using fallback suid method"); } } # endif check_need_suid: # endif - if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) { + if (APPLET_SUID(applet_no) == BB_SUID_REQUIRE) { /* Real uid is not 0. If euid isn't 0 too, suid bit * is most probably not set on our executable */ if (geteuid()) - bb_error_msg_and_die("must be suid to work properly"); - } else if (APPLET_SUID(applet_no) == _BB_SUID_DROP) { - xsetgid(rgid); /* drop all privileges */ - xsetuid(ruid); + bb_simple_error_msg_and_die("must be suid to work properly"); + } else if (APPLET_SUID(applet_no) == BB_SUID_DROP) { + /* + * Drop all privileges. + * + * Don't check for errors: in normal use, they are impossible, + * and in special cases, exiting is harmful. Example: + * 'unshare --user' when user's shell is also from busybox. + * + * 'unshare --user' creates a new user namespace without any + * uid mappings. Thus, busybox binary is setuid nobody:nogroup + * within the namespace, as that is the only user. However, + * since no uids are mapped, calls to setgid/setuid + * fail (even though they would do nothing). + */ + setgid(rgid); + setuid(ruid); } +# if ENABLE_FEATURE_SUID_CONFIG + ret: ; + llist_free((llist_t*)suid_config, NULL); +# endif } # else # define check_suid(x) ((void)0) @@ -611,6 +723,7 @@ static void install_links(const char *busybox, int use_symbolic_links, * busybox.h::bb_install_loc_t, or else... */ int (*lf)(const char *, const char *); char *fpc; + const char *appname = applet_names; unsigned i; int rc; @@ -621,7 +734,7 @@ static void install_links(const char *busybox, int use_symbolic_links, for (i = 0; i < ARRAY_SIZE(applet_main); i++) { fpc = concat_path_file( custom_install_dir ? custom_install_dir : install_dir[APPLET_INSTALL_LOC(i)], - APPLET_NAME(i)); + appname); // debug: bb_error_msg("%slinking %s to busybox", // use_symbolic_links ? "sym" : "", fpc); rc = lf(busybox, fpc); @@ -629,14 +742,85 @@ static void install_links(const char *busybox, int use_symbolic_links, bb_simple_perror_msg(fpc); } free(fpc); + while (*appname++ != '\0') + continue; } } -# else -# define install_links(x,y,z) ((void)0) +# elif ENABLE_BUSYBOX +static void install_links(const char *busybox UNUSED_PARAM, + int use_symbolic_links UNUSED_PARAM, + char *custom_install_dir UNUSED_PARAM) +{ +} # endif -/* If we were called as "busybox..." */ -static int busybox_main(char **argv) +# if ENABLE_BUSYBOX || NUM_APPLETS > 0 +static void run_applet_and_exit(const char *name, char **argv) NORETURN; +#endif + +# if NUM_SCRIPTS > 0 +static int find_script_by_name(const char *name) +{ + int i; + int applet = find_applet_by_name(name); + + if (applet >= 0) { + for (i = 0; i < NUM_SCRIPTS; ++i) + if (applet_numbers[i] == applet) + return i; + } + return -1; +} + +int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; +int scripted_main(int argc UNUSED_PARAM, char **argv) +{ + int script = find_script_by_name(applet_name); + if (script >= 0) +# if ENABLE_SHELL_ASH + exit(ash_main(-script - 1, argv)); +# elif ENABLE_SHELL_HUSH + exit(hush_main(-script - 1, argv)); +# else + return 1; +# endif + return 0; +} + +char* FAST_FUNC +get_script_content(unsigned n) +{ + char *t = unpack_bz2_data(packed_scripts, sizeof(packed_scripts), + UNPACKED_SCRIPTS_LENGTH); + if (t) { + while (n != 0) { + while (*t++ != '\0') + continue; + n--; + } + } + return t; +} +# endif /* NUM_SCRIPTS > 0 */ + +# if ENABLE_BUSYBOX +# if ENABLE_FEATURE_SH_STANDALONE && ENABLE_FEATURE_TAB_COMPLETION + /* + * Insert "busybox" into applet table as well. + * This makes standalone shell tab-complete this name too. + * (Otherwise having "busybox" in applet table is not necessary, + * there is other code which routes "busyboxANY_SUFFIX" name + * to busybox_main()). + */ +//usage:#define busybox_trivial_usage NOUSAGE_STR +//usage:#define busybox_full_usage "" +//applet:IF_BUSYBOX(IF_FEATURE_SH_STANDALONE(IF_FEATURE_TAB_COMPLETION(APPLET(busybox, BB_DIR_BIN, BB_SUID_MAYBE)))) +int busybox_main(int argc, char *argv[]) MAIN_EXTERNALLY_VISIBLE; +# else +# define busybox_main(argc,argv) busybox_main(argv) +static +# endif +int busybox_main(int argc UNUSED_PARAM, char **argv) { if (!argv[1]) { /* Called without arguments */ @@ -644,35 +828,46 @@ static int busybox_main(char **argv) int col; unsigned output_width; help: - output_width = 80; - if (ENABLE_FEATURE_AUTOWIDTH) { - /* Obtain the terminal width */ - get_terminal_width_height(0, &output_width, NULL); - } + output_width = get_terminal_width(2); dup2(1, 2); full_write2_str(bb_banner); /* reuse const string */ full_write2_str(" multi-call binary.\n"); /* reuse */ full_write2_str( - "Copyright (C) 1998-2009 Erik Andersen, Rob Landley, Denys Vlasenko\n" - "and others. Licensed under GPLv2.\n" - "See source distribution for full notice.\n" + "BusyBox is copyrighted by many authors between 1998-2015.\n" + "Licensed under GPLv2. See source distribution for detailed\n" + "copyright notices.\n" "\n" - "Usage: busybox [function] [arguments]...\n" - " or: busybox --list[-full]\n" + "Usage: busybox [function [arguments]...]\n" + " or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n" +# if ENABLE_FEATURE_SHOW_SCRIPT && NUM_SCRIPTS > 0 + " or: busybox --show SCRIPT\n" +# endif + IF_FEATURE_INSTALLER( + " or: busybox --install [-s] [DIR]\n" + ) " or: function [arguments]...\n" "\n" + IF_NOT_FEATURE_SH_STANDALONE( "\tBusyBox is a multi-call binary that combines many common Unix\n" "\tutilities into a single executable. Most people will create a\n" "\tlink to busybox for each function they wish to use and BusyBox\n" "\twill act like whatever it was invoked as.\n" + ) + IF_FEATURE_SH_STANDALONE( + "\tBusyBox is a multi-call binary that combines many common Unix\n" + "\tutilities into a single executable. The shell in this build\n" + "\tis configured to run built-in utilities without $PATH search.\n" + "\tYou don't need to install a link to busybox for each utility.\n" + "\tTo run external program, use full path (/sbin/ip instead of ip).\n" + ) "\n" "Currently defined functions:\n" ); col = 0; - a = applet_names; /* prevent last comma to be in the very last pos */ output_width--; + a = applet_names; while (*a) { int len2 = strlen(a) + 2; if (col >= (int)output_width - len2) { @@ -689,23 +884,37 @@ static int busybox_main(char **argv) col += len2; a += len2 - 1; } - full_write2_str("\n\n"); + full_write2_str("\n"); + return 0; + } + +# if ENABLE_FEATURE_SHOW_SCRIPT && NUM_SCRIPTS > 0 + if (strcmp(argv[1], "--show") == 0) { + int n; + if (!argv[2]) + bb_error_msg_and_die(bb_msg_requires_arg, "--show"); + n = find_script_by_name(argv[2]); + if (n < 0) + bb_error_msg_and_die("script '%s' not found", argv[2]); + full_write1_str(get_script_content(n)); return 0; } +# endif - if (strncmp(argv[1], "--list", 6) == 0) { + if (is_prefixed_with(argv[1], "--list")) { unsigned i = 0; const char *a = applet_names; dup2(1, 2); while (*a) { -# if ENABLE_FEATURE_INSTALLER - if (argv[1][6]) /* --list-path? */ +# if ENABLE_FEATURE_INSTALLER + if (argv[1][6]) /* --list-full? */ full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1); -# endif +# endif full_write2_str(a); full_write2_str("\n"); i++; - a += strlen(a) + 1; + while (*a++ != '\0') + continue; } return 0; } @@ -713,13 +922,23 @@ static int busybox_main(char **argv) if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) { int use_symbolic_links; const char *busybox; + busybox = xmalloc_readlink(bb_busybox_exec_path); - if (!busybox) - busybox = bb_busybox_exec_path; - /* busybox --install [-s] [DIR]: */ - /* -s: make symlinks */ - /* DIR: directory to install links to */ - use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++); + if (!busybox) { + /* bb_busybox_exec_path is usually "/proc/self/exe". + * In chroot, readlink("/proc/self/exe") usually fails. + * In such case, better use argv[0] as symlink target + * if it is a full path name. + */ + if (argv[0][0] != '/') + bb_error_msg_and_die("'%s' is not an absolute path", argv[0]); + busybox = argv[0]; + } + /* busybox --install [-s] [DIR]: + * -s: make symlinks + * DIR: directory to install links to + */ + use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv); install_links(busybox, use_symbolic_links, argv[2]); return 0; } @@ -739,47 +958,101 @@ static int busybox_main(char **argv) * "#!/bin/busybox"-style wrappers */ applet_name = bb_get_last_path_component_nostrip(argv[0]); run_applet_and_exit(applet_name, argv); - - /*bb_error_msg_and_die("applet not found"); - sucks in printf */ - full_write2_str(applet_name); - full_write2_str(": applet not found\n"); - xfunc_die(); } +# endif -void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv) +# if NUM_APPLETS > 0 +void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **argv) { - int argc = 1; - - while (argv[argc]) - argc++; + int argc = string_array_len(argv); - /* Reinit some shared global data */ - xfunc_error_retval = EXIT_FAILURE; + /* + * We do not use argv[0]: do not want to repeat massaging of + * "-/sbin/halt" -> "halt", for example. + */ + applet_name = name; - applet_name = APPLET_NAME(applet_no); - if (argc == 2 && strcmp(argv[1], "--help") == 0) { - /* Special case. POSIX says "test --help" - * should be no different from e.g. "test --foo". */ -//TODO: just compare applet_no with APPLET_NO_test - if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) + /* Special case. POSIX says "test --help" + * should be no different from e.g. "test --foo". + * Thus for "test", we skip --help check. + * "true" and "false" are also special. + */ + if (1 +# if defined APPLET_NO_test + && applet_no != APPLET_NO_test +# endif +# if defined APPLET_NO_true + && applet_no != APPLET_NO_true +# endif +# if defined APPLET_NO_false + && applet_no != APPLET_NO_false +# endif + ) { + if (argc == 2 && strcmp(argv[1], "--help") == 0) { + /* Make "foo --help" exit with 0: */ + xfunc_error_retval = 0; bb_show_usage(); + } } if (ENABLE_FEATURE_SUID) check_suid(applet_no); - exit(applet_main[applet_no](argc, argv)); + xfunc_error_retval = applet_main[applet_no](argc, argv); + /* Note: applet_main() may also not return (die on a xfunc or such) */ + xfunc_die(); } +# endif /* NUM_APPLETS > 0 */ -void FAST_FUNC run_applet_and_exit(const char *name, char **argv) +# if ENABLE_BUSYBOX || NUM_APPLETS > 0 +static NORETURN void run_applet_and_exit(const char *name, char **argv) { - int applet = find_applet_by_name(name); - if (applet >= 0) - run_applet_no_and_exit(applet, argv); - if (strncmp(name, "busybox", 7) == 0) - exit(busybox_main(argv)); +# if ENABLE_BUSYBOX + if (is_prefixed_with(name, "busybox")) + exit(busybox_main(/*unused:*/ 0, argv)); +# endif +# if NUM_APPLETS > 0 + /* find_applet_by_name() search is more expensive, so goes second */ + { + int applet = find_applet_by_name(name); + if (applet >= 0) + run_applet_no_and_exit(applet, name, argv); + } +# endif + + /*bb_error_msg_and_die("applet not found"); - links in printf */ + full_write2_str(applet_name); + full_write2_str(": applet not found\n"); + /* POSIX: "If a command is not found, the exit status shall be 127" */ + exit(127); } +# endif -#endif /* !defined(SINGLE_APPLET_MAIN) */ +#else /* defined(SINGLE_APPLET_MAIN) */ +# if NUM_SCRIPTS > 0 +/* if SINGLE_APPLET_MAIN, these two functions are simpler: */ +int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; +int scripted_main(int argc UNUSED_PARAM, char **argv) +{ +# if ENABLE_SHELL_ASH + int script = 0; + exit(ash_main(-script - 1, argv)); +# elif ENABLE_SHELL_HUSH + int script = 0; + exit(hush_main(-script - 1, argv)); +# else + return 1; +# endif +} +char* FAST_FUNC +get_script_content(unsigned n UNUSED_PARAM) +{ + char *t = unpack_bz2_data(packed_scripts, sizeof(packed_scripts), + UNPACKED_SCRIPTS_LENGTH); + return t; +} +# endif /* NUM_SCRIPTS > 0 */ + +#endif /* defined(SINGLE_APPLET_MAIN) */ #if ENABLE_BUILD_LIBBUSYBOX @@ -788,22 +1061,40 @@ int lbb_main(char **argv) int main(int argc UNUSED_PARAM, char **argv) #endif { - /* Tweak malloc for reduced memory consumption */ -#ifndef PAGE_SIZE -# define PAGE_SIZE (4*1024) /* guess */ +#if 0 + /* TODO: find a use for a block of memory between end of .bss + * and end of page. For example, I'm getting "_end:0x812e698 2408 bytes" + * - more than 2k of wasted memory (in this particular build) + * *per each running process*! + * (If your linker does not generate "_end" name, weak attribute + * makes &_end == NULL, end_len == 0 here.) + */ + extern char _end[] __attribute__((weak)); + unsigned end_len = (-(int)_end) & 0xfff; + printf("_end:%p %u bytes\n", &_end, end_len); #endif + + /* Tweak malloc for reduced memory consumption */ #ifdef M_TRIM_THRESHOLD /* M_TRIM_THRESHOLD is the maximum amount of freed top-most memory * to keep before releasing to the OS * Default is way too big: 256k */ - mallopt(M_TRIM_THRESHOLD, 2 * PAGE_SIZE); + mallopt(M_TRIM_THRESHOLD, 8 * 1024); #endif #ifdef M_MMAP_THRESHOLD /* M_MMAP_THRESHOLD is the request size threshold for using mmap() * Default is too big: 256k */ - mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256); + mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256); +#endif +#if 0 /*def M_TOP_PAD*/ + /* When the program break is increased, then M_TOP_PAD bytes are added + * to the sbrk(2) request. When the heap is trimmed because of free(3), + * this much free space is preserved at the top of the heap. + * glibc default seems to be way too big: 128k, but need to verify. + */ + mallopt(M_TOP_PAD, 8 * 1024); #endif #if !BB_MMU @@ -815,29 +1106,49 @@ int main(int argc UNUSED_PARAM, char **argv) #endif #if defined(SINGLE_APPLET_MAIN) + /* Only one applet is selected in .config */ - if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) { + if (argv[1] && is_prefixed_with(argv[0], "busybox")) { /* "busybox " should still work as expected */ argv++; } /* applet_names in this case is just "applet\0\0" */ lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv)); +# if ENABLE_BUILD_LIBBUSYBOX + return SINGLE_APPLET_MAIN(string_array_len(argv), argv); +# else return SINGLE_APPLET_MAIN(argc, argv); +# endif + +#elif !ENABLE_BUSYBOX && NUM_APPLETS == 0 + + full_write2_str(bb_basename(argv[0])); + full_write2_str(": no applets enabled\n"); + exit(127); + #else - lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); + lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); +# if !ENABLE_BUSYBOX + if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) + argv++; +# endif applet_name = argv[0]; if (applet_name[0] == '-') applet_name++; applet_name = bb_basename(applet_name); - parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ + /* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */ + if (ENABLE_FEATURE_SH_STANDALONE + || ENABLE_FEATURE_PREFER_APPLETS + || !BB_MMU + ) { + if (NUM_APPLETS > 1) + set_task_comm(applet_name); + } + parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ run_applet_and_exit(applet_name, argv); - /*bb_error_msg_and_die("applet not found"); - sucks in printf */ - full_write2_str(applet_name); - full_write2_str(": applet not found\n"); - xfunc_die(); #endif }