picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix possible endless loop for GOTO to non-existent LABEL

Browse source 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526365
This commit is contained in:
Kay Sievers 2009-05-13 18:01:32 +02:00
parent 6205f1186e
commit 0c37798916
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/udev-test.pl
View file

@ -1554,6 +1554,17 @@ KERNEL=="sda1", GOTO="BAD"
KERNEL=="sda1", NAME="", LABEL="NO"
KERNEL=="sda1", NAME="right", LABEL="TEST"
KERNEL=="sda1", LABEL="BAD"
EOF
},
{
desc => "GOTO label does not exist",
subsys => "block",
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
exp_name => "right",
rules => <<EOF
KERNEL=="sda1", GOTO="does-not-exist"
KERNEL=="sda1", NAME="right",
LABEL="exists"
EOF
},
{

3
udev/udev-rules.c
View file

@ -1610,6 +1610,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
if (strcmp(label, &rules->buf[rules->tokens[j].rule.label_off]) != 0)
continue;
rules->tokens[i].key.rule_goto = j;
break;
}
if (rules->tokens[i].key.rule_goto == 0)
err(rules->udev, "GOTO '%s' has no matching label in: '%s'\n", label, filename);
@ -2504,6 +2505,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
break;
}
case TK_A_GOTO:
if (cur->key.rule_goto == 0)
break;
cur = &rules->tokens[cur->key.rule_goto];
continue;
case TK_A_LAST_RULE: