fix use-after-free when an interface event is pending while the interface is being...

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index c918203..bbec860 100644 (file)
--- a/main.c
+++ b/main.c
@@ -21,6 +21,17 @@ static char **global_argv;
 static struct list_head process_list = LIST_HEAD_INIT(process_list);
 static struct list_head fds = LIST_HEAD_INIT(fds);
 
+#define DEFAULT_LOG_LEVEL L_NOTICE
+
+static int log_level = DEFAULT_LOG_LEVEL;
+static const int log_class[] = {
+       [L_CRIT] = LOG_CRIT,
+       [L_WARNING] = LOG_WARNING,
+       [L_NOTICE] = LOG_NOTICE,
+       [L_INFO] = LOG_INFO,
+       [L_DEBUG] = LOG_DEBUG
+};
+
 #ifdef DUMMY_MODE
 #define use_syslog false
 #else
@@ -35,6 +46,10 @@ netifd_delete_process(struct netifd_process *proc)
                uloop_process_delete(&proc->uloop);
        list_del(&proc->list);
        netifd_fd_delete(&proc->log_fd);
+       if (proc->log_buf) {
+               free(proc->log_buf);
+               proc->log_buf = NULL;
+       }
 }
 
 void
@@ -42,9 +57,12 @@ netifd_log_message(int priority, const char *format, ...)
 {
        va_list vl;
 
+       if (priority > log_level)
+               return;
+
        va_start(vl, format);
        if (use_syslog)
-               vsyslog(priority, format, vl);
+               vsyslog(log_class[priority], format, vl);
        else
                vfprintf(stderr, format, vl);
        va_end(vl);
@@ -63,30 +81,35 @@ netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
        if (!proc->log_buf)
                proc->log_buf = malloc(LOG_BUF_SIZE + 1);
 
-       buf = proc->log_buf + proc->log_buf_ofs;
-       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
        log_prefix = proc->log_prefix;
        if (!log_prefix)
                log_prefix = "process";
 
 retry:
+       buf = proc->log_buf + proc->log_buf_ofs;
+       maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
        read_len = len = read(fd->fd, buf, maxlen);
-       if (len <= 0) {
+       if (len < 0) {
                if (errno == EINTR)
                        goto retry;
 
-               return;
-       }
+               goto out;
+       } else if (len == 0)
+               goto out;
+
        proc->log_buf_ofs += len;
 
-       cur = buf;
+       len = proc->log_buf_ofs;
        buf = proc->log_buf;
-       while ((cur = memchr(cur, '\n', len))) {
+       while (len > 0) {
+               cur = memchr(buf, '\n', len);
+               if (!cur)
+                       break;
+
                *cur = 0;
 
                if (!proc->log_overflow)
-                       netifd_log_message(LOG_NOTICE, "%s (%d): %s\n",
+                       netifd_log_message(L_NOTICE, "%s (%d): %s\n",
                                log_prefix, proc->uloop.pid, buf);
                else
                        proc->log_overflow = false;
@@ -97,12 +120,12 @@ retry:
        }
 
        if (buf > proc->log_buf && len > 0)
-               memmove(buf, proc->log_buf, len);
+               memmove(proc->log_buf, buf, len);
 
        if (len == LOG_BUF_SIZE) {
                if (!proc->log_overflow) {
                        proc->log_buf[LOG_BUF_SIZE] = 0;
-                       netifd_log_message(LOG_NOTICE, "%s (%d): %s [...]\n",
+                       netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
                                log_prefix, proc->uloop.pid, proc->log_buf);
                        proc->log_overflow = true;
                }
@@ -110,8 +133,12 @@ retry:
        }
        proc->log_buf_ofs = len;
 
-       if (read_len == maxlen)
+       if (read_len > 0)
                goto retry;
+
+out:
+       if (fd->eof)
+               uloop_fd_delete(fd);
 }
 
 static void
@@ -176,6 +203,7 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
        uloop_process_add(&proc->uloop);
        list_add_tail(&proc->list, &process_list);
 
+       proc->log_buf_ofs = 0;
        proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
        proc->log_uloop.cb = netifd_process_log_cb;
        netifd_fd_add(&proc->log_fd);
@@ -195,7 +223,7 @@ netifd_kill_process(struct netifd_process *proc)
        if (!proc->uloop.pending)
                return;
 
-       kill(proc->uloop.pid, SIGTERM);
+       kill(proc->uloop.pid, SIGKILL);
        netifd_delete_process(proc);
 }
 
@@ -218,7 +246,7 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 
 static void netifd_do_reload(struct uloop_timeout *timeout)
 {
-       config_init_interfaces(NULL);
+       config_init_all();
 }
 
 static struct uloop_timeout main_timer;
@@ -245,9 +273,10 @@ static int usage(const char *progname)
                " -p <path>:            Path to netifd addons (default: %s)\n"
                " -h <path>:            Path to the hotplug script\n"
                " -r <path>:            Path to resolv.conf\n"
+               " -l <level>:           Log output level (default: %d)\n"
                " -S:                   Use stderr instead of syslog for log messages\n"
                "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
-               "\n", progname, main_path);
+               "\n", progname, main_path, DEFAULT_LOG_LEVEL);
 
        return 1;
 }
@@ -291,7 +320,7 @@ int main(int argc, char **argv)
 
        global_argv = argv;
 
-       while ((ch = getopt(argc, argv, "d:s:p:h:r:S")) != -1) {
+       while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) {
                switch(ch) {
                case 'd':
                        debug_mask = strtoul(optarg, NULL, 0);
@@ -308,6 +337,11 @@ int main(int argc, char **argv)
                case 'r':
                        resolv_conf = optarg;
                        break;
+               case 'l':
+                       log_level = atoi(optarg);
+                       if (log_level >= ARRAY_SIZE(log_class))
+                               log_level = ARRAY_SIZE(log_class) - 1;
+                       break;
 #ifndef DUMMY_MODE
                case 'S':
                        use_syslog = false;
@@ -332,7 +366,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       config_init_interfaces(NULL);
+       config_init_all();
 
        uloop_run();
        netifd_kill_processes();