* FEATURE_INSTALLER or FEATURE_SUID will still link printf routines in. :(
*/
#include "busybox.h"
-#include <assert.h>
-#include <malloc.h>
-/* Try to pull in PAGE_SIZE */
-#ifdef __linux__
-# include <sys/user.h>
-#endif
-#ifdef __GNU__ /* Hurd */
-# include <mach/vm_param.h>
+
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+ || defined(__APPLE__) \
+ )
+# include <malloc.h> /* for mallopt */
#endif
#include "applets.h"
#undef PROTOTYPES
-
/* Include generated applet names, pointers to <applet>_main, etc */
#include "applet_tables.h"
/* ...and if applet_tables generator says we have only one applet... */
# define IF_FEATURE_INDIVIDUAL(...) __VA_ARGS__
#endif
-
#include "usage_compressed.h"
+
#if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
#else
#if ENABLE_FEATURE_COMPRESS_USAGE
static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "archive.h"
+# include "bb_archive.h"
static const char *unpack_usage_messages(void)
{
char *outbuf = NULL;
if (ENABLE_SHOW_USAGE) {
#ifdef SINGLE_APPLET_STR
/* Imagine that this applet is "true". Dont suck in printf! */
- const char *p;
- const char *usage_string = p = unpack_usage_messages();
+ const char *usage_string = unpack_usage_messages();
- if (*p == '\b') {
+ if (*usage_string == '\b') {
full_write2_str("No help available.\n\n");
} else {
full_write2_str("Usage: "SINGLE_APPLET_STR" ");
- full_write2_str(p);
+ full_write2_str(usage_string);
full_write2_str("\n\n");
}
if (ENABLE_FEATURE_CLEAN_UP)
}
#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)
+static int applet_name_compare(const void *name, const void *idx)
{
- int i = (const char *)v - applet_names;
+ int i = (int)(ptrdiff_t)idx - 1;
return strcmp(name, APPLET_NAME(i));
}
#endif
#if NUM_APPLETS > 8
/* Do a binary search to find the applet entry given the name. */
const char *p;
- p = bsearch(name, applet_names, ARRAY_SIZE(applet_main), 1, applet_name_compare);
- if (!p)
- return -1;
- return p - applet_names;
+ p = bsearch(name, (void*)(ptrdiff_t)1, ARRAY_SIZE(applet_main), 1, applet_name_compare);
+ /*
+ * if (!p) return -1;
+ * ^^^^^^^^^^^^^^^^^^ the code below will do this if p == NULL :)
+ */
+ return (int)(ptrdiff_t)p - 1;
#else
/* A version which does not pull in bsearch */
int i = 0;
IF_FEATURE_SUID(static uid_t ruid;) /* real uid */
-#if ENABLE_FEATURE_SUID_CONFIG
+# 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;
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
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;
|| !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;
}
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.
* 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
/* 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
* 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
* 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;
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("<uid>.<gid>");
- }
- *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, /*allow_numeric:*/ 1) == 0) {
+ errmsg = "unknown user/group";
+ goto pe_label;
}
- sct->m_gid = grp->gr_gid;
}
}
continue;
* 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
+# else
static inline void parse_config_file(void)
{
IF_FEATURE_SUID(ruid = getuid();)
}
-#endif /* FEATURE_SUID_CONFIG */
+# endif /* FEATURE_SUID_CONFIG */
-#if ENABLE_FEATURE_SUID
+# if ENABLE_FEATURE_SUID
static void check_suid(int applet_no)
{
gid_t rgid; /* real gid */
return; /* run by root - no need to check more */
rgid = getgid();
-#if ENABLE_FEATURE_SUID_CONFIG
+# 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) {
}
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_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");
- /* 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;
+
+ goto ret;
}
-#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
+# if !ENABLE_FEATURE_SUID_CONFIG_QUIET
{
static bool onetime = 0;
if (!onetime) {
onetime = 1;
- fprintf(stderr, "Using fallback suid method\n");
+ bb_error_msg("using fallback suid method");
}
}
-#endif
+# endif
check_need_suid:
-#endif
- if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) {
+# endif
+ 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) {
+ } else if (APPLET_SUID(applet_no) == BB_SUID_DROP) {
xsetgid(rgid); /* drop all privileges */
xsetuid(ruid);
}
+# if ENABLE_FEATURE_SUID_CONFIG
+ ret: ;
+ llist_free((llist_t*)suid_config, NULL);
+# endif
}
-#else
-#define check_suid(x) ((void)0)
-#endif /* FEATURE_SUID */
+# else
+# define check_suid(x) ((void)0)
+# endif /* FEATURE_SUID */
-#if ENABLE_FEATURE_INSTALLER
+# if ENABLE_FEATURE_INSTALLER
static const char usr_bin [] ALIGN1 = "/usr/bin/";
static const char usr_sbin[] ALIGN1 = "/usr/sbin/";
static const char *const install_dir[] = {
&usr_bin [8], /* "/" */
&usr_bin [4], /* "/bin/" */
&usr_sbin[4] /* "/sbin/" */
-# if !ENABLE_INSTALL_NO_USR
+# if !ENABLE_INSTALL_NO_USR
,usr_bin
,usr_sbin
-# endif
+# endif
};
-
/* create (sym)links for each applet */
static void install_links(const char *busybox, int use_symbolic_links,
char *custom_install_dir)
free(fpc);
}
}
-#else
-# define install_links(x,y,z) ((void)0)
-#endif
+# else
+# define install_links(x,y,z) ((void)0)
+# endif
/* If we were called as "busybox..." */
static int busybox_main(char **argv)
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-2012.\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_FEATURE_INSTALLER(
+ " or: busybox --install [-s] [DIR]\n"
+ )
" or: function [arguments]...\n"
"\n"
"\tBusyBox is a multi-call binary that combines many common Unix\n"
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++;
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;
}
/* 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)
+ if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) {
+ /* If you want "foo --help" to return 0: */
+ xfunc_error_retval = 0;
bb_show_usage();
+ }
}
if (ENABLE_FEATURE_SUID)
check_suid(applet_no);
int applet = find_applet_by_name(name);
if (applet >= 0)
run_applet_no_and_exit(applet, argv);
- if (!strncmp(name, "busybox", 7))
+ if (strncmp(name, "busybox", 7) == 0)
exit(busybox_main(argv));
}
#endif
{
/* Tweak malloc for reduced memory consumption */
-#ifndef PAGE_SIZE
-# define PAGE_SIZE (4*1024) /* guess */
-#endif
#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 defined(SINGLE_APPLET_MAIN)
- /* Only one applet is selected by the user! */
- /* applet_names in this case is just "applet\0\0" */
- lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
- return SINGLE_APPLET_MAIN(argc, argv);
-#else
- lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
-
#if !BB_MMU
/* NOMMU re-exec trick sets high-order bit in first byte of name */
if (argv[0][0] & 0x80) {
argv[0][0] &= 0x7f;
}
#endif
+
+#if defined(SINGLE_APPLET_MAIN)
+ /* Only one applet is selected in .config */
+ if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
+ /* "busybox <applet> <params>" should still work as expected */
+ argv++;
+ }
+ /* applet_names in this case is just "applet\0\0" */
+ lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
+ return SINGLE_APPLET_MAIN(argc, argv);
+#else
+ lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
+
applet_name = argv[0];
if (applet_name[0] == '-')
applet_name++;
projects / platform / upstream / busybox.git / blobdiff