From: Michal Sekletar <msekletar@users.noreply.github.com>
Date: Fri, 28 Oct 2016 10:09:14 +0000 (+0200)
Subject: udev: allow substitutions for SECLABEL key (#4505)
X-Git-Tag: v232~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f985bd80278972912b80df1390f84d7a89f8d51;p=thirdparty%2Fsystemd.git

udev: allow substitutions for SECLABEL key (#4505)
---

diff --git a/man/udev.xml b/man/udev.xml
index dd5563605ca..3359fb0865a 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -577,8 +577,8 @@
 
       <para>The <varname>NAME</varname>, <varname>SYMLINK</varname>,
       <varname>PROGRAM</varname>, <varname>OWNER</varname>,
-      <varname>GROUP</varname>, <varname>MODE</varname>, and
-      <varname>RUN</varname> fields support simple string substitutions.
+      <varname>GROUP</varname>, <varname>MODE</varname>, <varname>SECLABEL</varname>,
+      and <varname>RUN</varname> fields support simple string substitutions.
       The <varname>RUN</varname> substitutions are performed after all rules
       have been processed, right before the program is executed, allowing for
       the use of device properties set by earlier matching rules. For all other
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 7619c8371b5..f6c416bf704 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2218,10 +2218,16 @@ void udev_rules_apply_to_event(struct udev_rules *rules,
                                   rule->rule.filename_line);
                         break;
                 case TK_A_SECLABEL: {
+                        char label_str[UTIL_LINE_SIZE] = {};
                         const char *name, *label;
 
                         name = rules_str(rules, cur->key.attr_off);
-                        label = rules_str(rules, cur->key.value_off);
+                        udev_event_apply_format(event, rules_str(rules, cur->key.value_off), label_str, sizeof(label_str));
+                        if (label_str[0] != '\0')
+                                label = label_str;
+                        else
+                                label = rules_str(rules, cur->key.value_off);
+
                         if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
                                 udev_list_cleanup(&event->seclabel_list);
                         udev_list_entry_add(&event->seclabel_list, name, label);