allow setting of MODE="0000"

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 3afc31a0fad8b7cb35d4a11ea9dc74da61fc4f46..6d88354dbddbb5337355eefb234f2455d9f2fbd6 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -28,6 +28,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 
 void udev_rules_iter_init(struct udev_rules *rules)
@@ -469,6 +470,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                }
 
                if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid TEST operation");
+                               goto invalid;
+                       }
                        attr = get_key_attribute(key + sizeof("TEST")-1);
                        if (attr != NULL)
                                rule->test_mode_mask = strtol(attr, NULL, 8);
@@ -573,8 +579,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                }
 
                if (strcasecmp(key, "MODE") == 0) {
-                       rule->mode = strtol(value, NULL, 8);
-                       rule->mode_operation = operation;
+                       add_rule_key(rule, &rule->mode, operation, value);
                        valid = 1;
                        continue;
                }
@@ -740,7 +745,9 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
        strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
        if (stat(filename, &statbuf) != 0) {
                create_path(filename);
+               selinux_setfscreatecon(filename, NULL, S_IFDIR|0755);
                mkdir(filename, 0755);
+               selinux_resetfscreatecon();
        }
        add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);