X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=63123e083a9a5b6fd0e56ff575c2a42e3fe2fd96;hb=cbfad6af1fdc73c6f3c6b001047ff4a86c8a6efd;hp=892d8f27a76b0c07dfb9c1b1bde214b104393a4f;hpb=8958da13c72024c4eaa2996b86fce2959e452db4;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 892d8f27a..63123e083 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -2443,19 +2443,22 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			}
 		case TK_A_MODE:
 			{
-				char mode[UTIL_NAME_SIZE];
+				char mode_str[UTIL_NAME_SIZE];
+				mode_t mode;
 				char *endptr;
 
 				if (event->mode_final)
 					break;
-				if (cur->key.op == OP_ASSIGN_FINAL)
-					event->mode_final = true;
-				udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode, sizeof(mode));
-				event->mode = strtol(mode, &endptr, 8);
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode_str, sizeof(mode_str));
+				mode = strtol(mode_str, &endptr, 8);
 				if (endptr[0] != '\0') {
-					err(event->udev, "invalide mode '%s' set default mode 0600\n", mode);
-					event->mode = 0600;
+					err(event->udev, "ignoring invalid mode '%s'\n", mode_str);
+					break;
 				}
+				if (cur->key.op == OP_ASSIGN_FINAL)
+					event->mode_final = true;
+				event->mode_set = true;
+				event->mode = mode;
 				info(event->udev, "MODE %#o %s:%u\n",
 				     event->mode,
 				     &rules->buf[rule->rule.filename_off],
@@ -2489,6 +2492,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				break;
 			if (cur->key.op == OP_ASSIGN_FINAL)
 				event->mode_final = true;
+			event->mode_set = true;
 			event->mode = cur->key.mode;
 			info(event->udev, "MODE %#o %s:%u\n",
 			     event->mode,