fix segfault caused by wrong pointer used in dbg()

[elogind.git] / udev / udev_rules_parse.c

diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c
index 229096c8d77d6d6809aab1c41c8e924f8d7b1458..5a9552ffde9202af968434de95ace4d984ae6d6d 100644 (file)
--- a/udev/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
@@ -31,7 +31,7 @@
 
 void udev_rules_iter_init(struct udev_rules_iter *iter, struct udev_rules *rules)
 {
-       dbg(iter->rules->udev, "bufsize=%zi\n", rules->bufsize);
+       dbg(rules->udev, "bufsize=%zi\n", rules->bufsize);
        iter->rules = rules;
        iter->current = 0;
 }
@@ -58,29 +58,40 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules_iter *iter)
        return rule;
 }
 
-struct udev_rule *udev_rules_iter_label(struct udev_rules_iter *iter, const char *label)
+struct udev_rule *udev_rules_iter_goto(struct udev_rules_iter *iter, size_t rule_off)
+{
+       struct udev_rules *rules = iter->rules;
+       struct udev_rule *rule;
+
+       dbg(rules->udev, "current=%zi\n", iter->current);
+       iter->current = rule_off;
+       rule = (struct udev_rule *) (rules->buf + iter->current);
+
+       return rule;
+}
+
+static size_t find_label(const struct udev_rules_iter *iter, const char *label)
 {
        struct udev_rule *rule;
        struct udev_rules *rules = iter->rules;
-       size_t start = iter->current;
+       size_t current = iter->current;
 
 next:
-       dbg(rules->udev, "current=%zi\n", iter->current);
-       if (iter->current >= rules->bufsize) {
+       dbg(rules->udev, "current=%zi\n", current);
+       if (current >= rules->bufsize) {
                err(rules->udev, "LABEL='%s' not found, GOTO will be ignored\n", label);
-               iter->current = start;
-               return NULL;
+               return iter->current;
        }
-       rule = (struct udev_rule *) (rules->buf + iter->current);
+       rule = (struct udev_rule *) (rules->buf + current);
 
        if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
                dbg(rules->udev, "moving forward, looking for label '%s'\n", label);
-               iter->current += sizeof(struct udev_rule) + rule->bufsize;
+               current += sizeof(struct udev_rule) + rule->bufsize;
                goto next;
        }
 
        dbg(rules->udev, "found label '%s'\n", label);
-       return rule;
+       return current;
 }
 
 static int get_key(struct udev_rules *rules, char **line, char **key, enum key_operation *operation, char **value)
@@ -674,9 +685,14 @@ static int parse_file(struct udev_rules *rules, const char *filename)
        size_t cur;
        size_t count;
        int retval = 0;
+       size_t start;
+       struct udev_rule *rule;
+       struct udev_rules_iter iter;
+
+       start = rules->bufsize;
 
        if (file_map(filename, &buf, &bufsize) != 0) {
-               err(rules->udev, "can't open '%s' as rules file: %s\n", filename, strerror(errno));
+               err(rules->udev, "can't open '%s' as rules file: %m\n", filename);
                return -1;
        }
        info(rules->udev, "reading '%s' as rules file\n", filename);
@@ -722,6 +738,22 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                add_to_rules(rules, line, filename, lineno);
        }
 
+       /* Compute all goto targets within this file */
+       udev_rules_iter_init(&iter, rules);
+       udev_rules_iter_goto(&iter, start);
+       while((rule = udev_rules_iter_next(&iter))) {
+               if (rule->goto_label.operation != KEY_OP_UNSET) {
+                       char *goto_label = &rule->buf[rule->goto_label.val_off];
+
+                       dbg(rules->udev, "resolving goto label '%s'\n", goto_label);
+                       rule->goto_rule_off = find_label(&iter, goto_label);
+                       if (rule->goto_rule_off == iter.current) {
+                               err(rules->udev, "goto nonexistent label '%s' in '%s'\n",
+                                   goto_label, filename);
+                       }
+               }
+       }
+
        file_unmap(buf, bufsize);
        return retval;
 }
@@ -799,7 +831,7 @@ int udev_rules_init(struct udev *udev, struct udev_rules *rules, int resolve_nam
                        else
                                dbg(udev, "empty rules file '%s'\n", name_loop->name);
                } else
-                       err(udev, "could not read '%s': %s\n", name_loop->name, strerror(errno));
+                       err(udev, "could not read '%s': %m\n", name_loop->name);
                list_del(&name_loop->node);
                free(name_loop);
        }