diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-12 05:12:11 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-10-12 11:12:11 +0200 |
| commit | 3ccb886283a1a98b549f44b6d33edeecc3768f1f (patch) | |
| tree | 6efe6e9c2b5ea9d229f05ae58f2cd0aa858a4dfc /src/core | |
| parent | 9f1008d5131806a390d697f2e1e994ea1e9bf83d (diff) | |
Allow block and char classes in DeviceAllow bus properties (#4353)
Allowed paths are unified betwen the configuration file parses and the bus
property checker. The biggest change is that the bus code now allows "block-"
and "char-" classes. In addition, path_startswith("/dev") was used in the bus
code, and startswith("/dev") was used in the config file code. It seems
reasonable to use path_startswith() which allows a slightly broader class of
strings.
Fixes #3935.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/load-fragment.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 8f067b5586..06c156a623 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3084,9 +3084,7 @@ int config_parse_device_allow( if (!path) return log_oom(); - if (!startswith(path, "/dev/") && - !startswith(path, "block-") && - !startswith(path, "char-")) { + if (!is_deviceallow_pattern(path)) { log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid device node path '%s'. Ignoring.", path); return 0; } |