X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=face496ab33b68880635fa099d417035e053a5a4;hb=3e5958dee5f24283eb5c6a2d2d95e1a39428a3b8;hp=c4c684d05927a8d4aa9e880a968bdb57f12705ca;hpb=79f651f4bd2fb395a705792eb8ce551a6021bcd6;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index c4c684d05..face496ab 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -278,16 +278,36 @@ static int rules_parse(struct udevice *udev, const char *filename)
 					goto error;
 				}
 				pair = &rule.sysfs_pair[rule.sysfs_pair_count];
-				rule.sysfs_pair_count++;
-
 				attr = get_key_attribute(key + sizeof(KEY_SYSFS)-1);
 				if (attr == NULL) {
 					dbg("error parsing " KEY_SYSFS " attribute");
+					goto error;
+				}
+				strlcpy(pair->name, attr, sizeof(pair->name));
+				strlcpy(pair->value, value, sizeof(pair->value));
+				pair->operation = operation;
+				rule.sysfs_pair_count++;
+				valid = 1;
+				continue;
+			}
+
+			if (strncasecmp(key, KEY_ENV, sizeof(KEY_ENV)-1) == 0) {
+				struct key_pair *pair;
+
+				if (rule.env_pair_count >= KEY_ENV_PAIRS_MAX) {
+					dbg("skip rule, to many " KEY_ENV " keys in a single rule");
+					goto error;
+				}
+				pair = &rule.env_pair[rule.env_pair_count];
+				attr = get_key_attribute(key + sizeof(KEY_ENV)-1);
+				if (attr == NULL) {
+					dbg("error parsing " KEY_ENV " attribute");
 					continue;
 				}
 				strlcpy(pair->name, attr, sizeof(pair->name));
 				strlcpy(pair->value, value, sizeof(pair->value));
 				pair->operation = operation;
+				rule.env_pair_count++;
 				valid = 1;
 				continue;
 			}