core: rework how we validate DeviceAllow= settings
Let's make sure we don't validate "char-*" and "block-*" expressions as paths.
This commit is contained in:
+25
-4
@@ -893,10 +893,31 @@ bool is_device_path(const char *path) {
|
||||
path_startswith(path, "/sys/");
|
||||
}
|
||||
|
||||
bool is_deviceallow_pattern(const char *path) {
|
||||
return path_startswith(path, "/dev/") ||
|
||||
startswith(path, "block-") ||
|
||||
startswith(path, "char-");
|
||||
bool valid_device_node_path(const char *path) {
|
||||
|
||||
/* Some superficial checks whether the specified path is a valid device node path, all without looking at the
|
||||
* actual device node. */
|
||||
|
||||
if (!PATH_STARTSWITH_SET(path, "/dev/", "/run/systemd/inaccessible/"))
|
||||
return false;
|
||||
|
||||
if (endswith(path, "/")) /* can't be a device node if it ends in a slash */
|
||||
return false;
|
||||
|
||||
return path_is_normalized(path);
|
||||
}
|
||||
|
||||
bool valid_device_allow_pattern(const char *path) {
|
||||
assert(path);
|
||||
|
||||
/* Like valid_device_node_path(), but also allows full-subsystem expressions, like DeviceAllow= and DeviceDeny=
|
||||
* accept it */
|
||||
|
||||
if (startswith(path, "block-") ||
|
||||
startswith(path, "char-"))
|
||||
return true;
|
||||
|
||||
return valid_device_node_path(path);
|
||||
}
|
||||
|
||||
int systemd_installation_has_version(const char *root, unsigned minimal_version) {
|
||||
|
||||
@@ -147,7 +147,9 @@ char *file_in_same_dir(const char *path, const char *filename);
|
||||
bool hidden_or_backup_file(const char *filename) _pure_;
|
||||
|
||||
bool is_device_path(const char *path);
|
||||
bool is_deviceallow_pattern(const char *path);
|
||||
|
||||
bool valid_device_node_path(const char *path);
|
||||
bool valid_device_allow_pattern(const char *path);
|
||||
|
||||
int systemd_installation_has_version(const char *root, unsigned minimal_version);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user