chiark / gitweb /
[PATCH] remove untrusted chars read from sysfs-values or returned by PROGRAM
[elogind.git] / udev_config.c
index fe26850a87f69e7cc5e2036ba44c2d58c4217f89..7d6bb77e5bd7a1b28cbd09c9c5fe92615388b3f0 100644 (file)
@@ -21,9 +21,6 @@
  *
  */
 
-/* define this to enable parsing debugging */
-/* #define DEBUG_PARSER */
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <syslog.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
 
 /* global variables */
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_permissions_filename[PATH_MAX+NAME_MAX];
-char udev_rules_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
-char default_mode_str[MODE_SIZE];
-char default_owner_str[OWNER_SIZE];
-char default_group_str[GROUP_SIZE];
-int udev_log;
-int udev_sleep;
+char sysfs_path[PATH_SIZE];
+char udev_root[PATH_SIZE];
+char udev_db_path[PATH_SIZE];
+char udev_config_filename[PATH_SIZE];
+char udev_rules_filename[PATH_SIZE];
+int udev_log_priority;
 int udev_dev_d;
+int udev_hotplug_d;
 
-
-static int string_is_true(char *str)
+static int string_is_true(const char *str)
 {
        if (strcasecmp(str, "true") == 0)
                return 1;
        if (strcasecmp(str, "yes") == 0)
                return 1;
+       if (strcasecmp(str, "1") == 0)
+               return 1;
        return 0;
 }
 
-static void init_variables(void)
+static int log_priority(const char *priority)
 {
-       /* fill up the defaults.  
-        * If any config values are specified, they will
-        * override these values. */
-       strfieldcpy(udev_root, UDEV_ROOT);
-       strfieldcpy(udev_db_filename, UDEV_DB);
-       strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE);
-       strfieldcpy(udev_rules_filename, UDEV_RULES_FILE);
-       strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE);
-       udev_log = string_is_true(UDEV_LOG_DEFAULT);
-
-       udev_sleep = 1;
-       if (getenv("UDEV_NO_SLEEP") != NULL)
-               udev_sleep = 0;
+       char *endptr;
+       int prio;
+
+       prio = strtol(priority, &endptr, 10);
+       if (endptr[0] == '\0')
+               return prio;
+       if (strncasecmp(priority, "err", 3) == 0)
+               return LOG_ERR;
+       if (strcasecmp(priority, "info") == 0)
+               return LOG_INFO;
+       if (strcasecmp(priority, "debug") == 0)
+               return LOG_DEBUG;
+       if (string_is_true(priority))
+               return LOG_ERR;
 
-       udev_dev_d = 1;
-       if (getenv("UDEV_NO_DEVD") != NULL)
-               udev_dev_d = 0;
+       return 0;
 }
 
-#define set_var(_name, _var)                           \
-       if (strcasecmp(variable, _name) == 0) {         \
-               dbg_parse("%s = '%s'", _name, value);   \
-               strfieldcpymax(_var, value, sizeof(_var));\
-       }
-
-#define set_bool(_name, _var)                          \
-       if (strcasecmp(variable, _name) == 0) {         \
-               dbg_parse("%s = '%s'", _name, value);   \
-               _var = string_is_true(value);           \
-       }
-
-int parse_get_pair(char **orig_string, char **left, char **right)
+static int get_key(char **line, char **key, char **value)
 {
+       char *linepos;
        char *temp;
-       char *string = *orig_string;
 
-       if (!string)
-               return -ENODEV;
+       linepos = *line;
+       if (!linepos)
+               return -1;
 
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
 
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
+       /* get the key */
+       *key = linepos;
+       while (1) {
+               linepos++;
+               if (linepos[0] == '\0')
+                       return -1;
+               if (isspace(linepos[0]))
+                       break;
+               if (linepos[0] == '=')
+                       break;
+       }
+
+       /* terminate key */
+       linepos[0] = '\0';
+       linepos++;
+
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
 
-       /* take the right side and strip off the '"' */
-       while (isspace(*string))
-               ++string;
-       if (*string == '"')
-               ++string;
+       /* get the value*/
+       if (linepos[0] == '"')
+               linepos++;
        else
-               return -ENODEV;
+               return -1;
+       *value = linepos;
+
+       temp = strchr(linepos, '"');
+       if (!temp)
+               return -1;
+       temp[0] = '\0';
 
-       temp = strsep(&string, "\"");
-       if (!string || *temp == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-       
        return 0;
 }
 
 static int parse_config_file(void)
 {
-       char line[255];
-       char *temp;
+       char line[LINE_SIZE];
+       char *bufline;
+       char *linepos;
        char *variable;
        char *value;
        char *buf;
@@ -144,106 +140,111 @@ static int parse_config_file(void)
        int lineno;
        int retval = 0;
 
-       if (file_map(udev_config_filename, &buf, &bufsize) == 0) {
-               dbg("reading '%s' as config file", udev_config_filename);
-       } else {
-               dbg("can't open '%s' as config file", udev_config_filename);
+       if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
+               err("can't open '%s' as config file", udev_config_filename);
                return -ENODEV;
        }
 
        /* loop through the whole file */
        lineno = 0;
        cur = 0;
-       while (1) {
+       while (cur < bufsize) {
                count = buf_get_line(buf, bufsize, cur);
-
-               strncpy(line, buf + cur, count);
-               line[count] = '\0';
-               temp = line;
+               bufline = &buf[cur];
+               cur += count+1;
                lineno++;
 
-               cur += count+1;
-               if (cur > bufsize)
-                       break;
+               if (count >= sizeof(line)) {
+                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+                       continue;
+               }
+
+               /* eat the whitespace */
+               while ((count > 0) && isspace(bufline[0])) {
+                       bufline++;
+                       count--;
+               }
+               if (count == 0)
+                       continue;
 
-               dbg_parse("read '%s'", temp);
+               /* see if this is a comment */
+               if (bufline[0] == COMMENT_CHARACTER)
+                       continue;
 
-               /* eat the whitespace at the beginning of the line */
-               while (isspace(*temp))
-                       ++temp;
+               strlcpy(line, bufline, count);
 
-               /* empty line? */
-               if (*temp == 0x00)
+               linepos = line;
+               retval = get_key(&linepos, &variable, &value);
+               if (retval != 0) {
+                       err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
                        continue;
+               }
 
-               /* see if this is a comment */
-               if (*temp == COMMENT_CHARACTER)
+               if (strcasecmp(variable, "udev_root") == 0) {
+                       strlcpy(udev_root, value, sizeof(udev_root));
+                       remove_trailing_char(udev_root, '/');
                        continue;
+               }
 
-               retval = parse_get_pair(&temp, &variable, &value);
-               if (retval)
-                       break;
-               
-               dbg_parse("variable = '%s', value = '%s'", variable, value);
-
-               set_var("udev_root", udev_root);
-               set_var("udev_db", udev_db_filename);
-               set_var("udev_rules", udev_rules_filename);
-               set_var("udev_permissions", udev_permissions_filename);
-               set_var("default_mode", default_mode_str);
-               set_var("default_owner", default_owner_str);
-               set_var("default_group", default_group_str);
-               set_bool("udev_log", udev_log);
+               if (strcasecmp(variable, "udev_db") == 0) {
+                       strlcpy(udev_db_path, value, sizeof(udev_db_path));
+                       remove_trailing_char(udev_db_path, '/');
+                       continue;
+               }
+
+               if (strcasecmp(variable, "udev_rules") == 0) {
+                       strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
+                       remove_trailing_char(udev_rules_filename, '/');
+                       continue;
+               }
+
+               if (strcasecmp(variable, "udev_log") == 0) {
+                       udev_log_priority = log_priority(value);
+                       continue;
+               }
        }
-       dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename,
-                 lineno, temp - line, temp);
 
        file_unmap(buf, bufsize);
        return retval;
 }
 
-static void get_dirs(void)
+void udev_init_config(void)
 {
-       char *temp;
-       int retval;
-
-       retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
-       if (retval)
-               dbg("sysfs_get_mnt_path failed");
-
-       /* see if we should try to override any of the default values */
-       temp = getenv("UDEV_TEST");
-       if (temp != NULL) {
-               /* hm testing is happening, use the specified values, if they are present */
-               temp = getenv("SYSFS_PATH");
-               if (temp)
-                       strfieldcpy(sysfs_path, temp);
-               temp = getenv("UDEV_CONFIG_FILE");
-               if (temp)
-                       strfieldcpy(udev_config_filename, temp);
+       const char *env;
+
+       strcpy(udev_root, UDEV_ROOT);
+       strcpy(udev_db_path, UDEV_DB);
+       strcpy(udev_config_filename, UDEV_CONFIG_FILE);
+       strcpy(udev_rules_filename, UDEV_RULES_FILE);
+       udev_log_priority = LOG_ERR;
+       udev_dev_d = 1;
+       udev_hotplug_d = 1;
+       sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
+
+       env = getenv("UDEV_NO_DEVD");
+       if (env && string_is_true(env))
+               udev_dev_d = 0;
+
+       env = getenv("UDEV_NO_HOTPLUGD");
+       if (env && string_is_true(env))
+               udev_hotplug_d = 0;
+
+       env = getenv("UDEV_CONFIG_FILE");
+       if (env) {
+               strlcpy(udev_config_filename, env, sizeof(udev_config_filename));
+               remove_trailing_char(udev_config_filename, '/');
        }
-       dbg("sysfs_path='%s'", sysfs_path);
 
-       dbg_parse("udev_root = %s", udev_root);
-       dbg_parse("udev_config_filename = %s", udev_config_filename);
-       dbg_parse("udev_db_filename = %s", udev_db_filename);
-       dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-       dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-       dbg_parse("udev_log = %d", udev_log);
        parse_config_file();
 
-       dbg_parse("udev_root = %s", udev_root);
-       dbg_parse("udev_config_filename = %s", udev_config_filename);
-       dbg_parse("udev_db_filename = %s", udev_db_filename);
-       dbg_parse("udev_rules_filename = %s", udev_rules_filename);
-       dbg_parse("udev_permissions_filename = %s", udev_permissions_filename);
-       dbg_parse("udev_log_str = %d", udev_log);
-}
+       env = getenv("UDEV_LOG");
+       if (env)
+               udev_log_priority = log_priority(env);
 
-void udev_init_config(void)
-{
-       init_variables();
-       get_dirs();
+       dbg("sysfs_path='%s'", sysfs_path);
+       dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
+       dbg("udev_root='%s'", udev_root);
+       dbg("udev_db='%s'", udev_db_path);
+       dbg("udev_rules='%s'", udev_rules_filename);
+       dbg("udev_log=%d", udev_log_priority);
 }
-
-