]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev-rules: Use ordered_hashmap_ensure_put
authorSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 20:27:25 +0000 (21:27 +0100)
committerSusant Sahani <ssahani@vmware.com>
Tue, 19 Jan 2021 04:56:31 +0000 (05:56 +0100)
src/udev/udev-rules.c

index c5c2f8cfeacd72e6ab087baf69b3c34344bc5ef1..751623cb15decfc6b7e4f034380756b5d2c3be1f 100644 (file)
@@ -1977,13 +1977,12 @@ static int udev_rule_apply_token_to_event(
                 if (token->op == OP_ASSIGN)
                         ordered_hashmap_clear_free_free(event->seclabel_list);
 
-                r = ordered_hashmap_ensure_allocated(&event->seclabel_list, NULL);
-                if (r < 0)
+                r = ordered_hashmap_ensure_put(&event->seclabel_list, NULL, name, label);
+                if (r == -ENOMEM)
                         return log_oom();
-
-                r = ordered_hashmap_put(event->seclabel_list, name, label);
                 if (r < 0)
-                        return log_oom();
+                        return log_rule_error_errno(dev, rules, r, "Failed to store SECLABEL{%s}='%s': %m", name, label);;
+
                 log_rule_debug(dev, rules, "SECLABEL{%s}='%s'", name, label);
                 name = label = NULL;
                 break;