Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/init/init.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/init/init.c (modified) (13 diffs)

branches/3.2/mindi-busybox/init/init.c

@@ -10 +10 @@
  */
 
-//applet:IF_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_DROP))
-//applet:IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc))
+//applet:IF_INIT(APPLET(init, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, BB_DIR_ROOT, BB_SUID_DROP, linuxrc))
 
 //kbuild:lib-$(CONFIG_INIT) += init.o
@@ -109 +109 @@
 //config:     sets TERM to "vt102" if one is found.
 
+#define DEBUG_SEGV_HANDLER 0
+
 #include "libbb.h"
 #include <syslog.h>
@@ -114 +116 @@
 #include <sys/resource.h>
 #ifdef __linux__
-#include <linux/vt.h>
-#endif
-#if ENABLE_FEATURE_UTMP
-# include <utmp.h> /* DEAD_PROCESS */
+# include <linux/vt.h>
+# include <sys/sysinfo.h>
 #endif
 #include "reboot.h" /* reboot() constants */
+
+#if DEBUG_SEGV_HANDLER
+# undef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# undef __USE_GNU
+# define __USE_GNU 1
+# include <execinfo.h>
+# include <sys/ucontext.h>
+#endif
 
 /* Used only for sanitizing purposes in set_sane_term() below. On systems where
@@ -402 +411 @@
     int dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
 
+    command += dash;
+
     /* See if any special /bin/sh requiring characters are present */
     if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
-        strcpy(buf, "exec ");
-        strcpy(buf + 5, command + dash); /* excluding "-" */
+        sprintf(buf, "exec %s", command); /* excluding "-" */
         /* NB: LIBBB_DEFAULT_LOGIN_SHELL define has leading dash */
         cmd[0] = (char*)(LIBBB_DEFAULT_LOGIN_SHELL + !dash);
@@ -411 +421 @@
         cmd[2] = buf;
         cmd[3] = NULL;
+        command = LIBBB_DEFAULT_LOGIN_SHELL + 1;
     } else {
         /* Convert command (char*) into cmd (char**, one word per string) */
         char *word, *next;
         int i = 0;
-        next = strcpy(buf, command); /* including "-" */
+        next = strcpy(buf, command - dash); /* command including "-" */
+        command = next + dash;
         while ((word = strsep(&next, " \t")) != NULL) {
             if (*word != '\0') { /* not two spaces/tabs together? */
@@ -426 +438 @@
     /* If we saw leading "-", it is interactive shell.
      * Try harder to give it a controlling tty.
-     * And skip "-" in actual exec call. */
-    if (dash) {
+     */
+    if (ENABLE_FEATURE_INIT_SCTTY && dash) {
         /* _Attempt_ to make stdin a controlling tty. */
-        if (ENABLE_FEATURE_INIT_SCTTY)
-            ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
-    }
-    BB_EXECVP(cmd[0] + dash, cmd);
-    message(L_LOG | L_CONSOLE, "can't run '%s': %s", cmd[0], strerror(errno));
+        ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
+    }
+    /* Here command never contains the dash, cmd[0] might */
+    BB_EXECVP(command, cmd);
+    message(L_LOG | L_CONSOLE, "can't run '%s': %s", command, strerror(errno));
     /* returns if execvp fails */
 }
@@ -509 +521 @@
     /* Log the process name and args */
     message(L_LOG, "starting pid %d, tty '%s': '%s'",
-              getpid(), a->terminal, a->command);
+            getpid(), a->terminal, a->command);
 
     /* Now run it.  The new program will take over this PID,
@@ -523 +535 @@
 
     if (pid > 0) {
+        update_utmp(pid, DEAD_PROCESS,
+                /*tty_name:*/ NULL,
+                /*username:*/ NULL,
+                /*hostname:*/ NULL
+        );
         for (a = init_action_list; a; a = a->next) {
             if (a->pid == pid) {
@@ -529 +546 @@
             }
         }
-        update_utmp(pid, DEAD_PROCESS, /*tty_name:*/ NULL,
-                /*username:*/ NULL,
-                /*hostname:*/ NULL);
     }
     return NULL;
@@ -596 +610 @@
     nextp = &init_action_list;
     while ((a = *nextp) != NULL) {
-        /* Don't enter action if it's already in the list,
+        /* Don't enter action if it's already in the list.
          * This prevents losing running RESPAWNs.
          */
@@ -608 +622 @@
                 nextp = &(*nextp)->next;
             a->next = NULL;
-            break;
+            goto append;
         }
         nextp = &a->next;
     }
 
-    if (!a)
-        a = xzalloc(sizeof(*a));
+    a = xzalloc(sizeof(*a));
+
     /* Append to the end of the list */
+ append:
     *nextp = a;
     a->action_type = action_type;
@@ -954 +969 @@
 }
 
+#if DEBUG_SEGV_HANDLER
+static
+void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)
+{
+    long ip;
+    ucontext_t *uc;
+
+    uc = ucontext;
+    ip = uc->uc_mcontext.gregs[REG_EIP];
+    fdprintf(2, "signal:%d address:0x%lx ip:0x%lx\n",
+            sig,
+            /* this is void*, but using %p would print "(null)"
+             * even for ptrs which are not exactly 0, but, say, 0x123:
+             */
+            (long)info->si_addr,
+            ip);
+    {
+        /* glibc extension */
+        void *array[50];
+        int size;
+        size = backtrace(array, 50);
+        backtrace_symbols_fd(array, size, 2);
+    }
+    for (;;) sleep(9999);
+}
+#endif
+
 int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int init_main(int argc UNUSED_PARAM, char **argv)
@@ -960 +1002 @@
         return kill(1, SIGHUP);
     }
+
+#if DEBUG_SEGV_HANDLER
+    {
+        struct sigaction sa;
+        memset(&sa, 0, sizeof(sa));
+        sa.sa_sigaction = handle_sigsegv;
+        sa.sa_flags = SA_SIGINFO;
+        sigaction(SIGSEGV, &sa, NULL);
+        sigaction(SIGILL, &sa, NULL);
+        sigaction(SIGFPE, &sa, NULL);
+        sigaction(SIGBUS, &sa, NULL);
+    }
+#endif
 
     if (!DEBUG_INIT) {