SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs-util: rename path_is_safe() → path_is_normalized()

Browse Source 
Already, path_is_safe() refused paths container the "." dir. Doing that
isn't strictly necessary to be "safe" by most definitions of the word.
But it is necessary in order to consider a path "normalized". Hence,
"path_is_safe()" is slightly misleading a name, but
"path_is_normalize()" is more descriptive, hence let's rename things
accordingly.

No functional changes.
This commit is contained in:
Lennart Poettering
2017-11-17 11:13:44 +01:00
parent 5db9818772
commit 99be45a46f
11 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mount/mount-tool.c
+6 -6
View File
@@ -886,8 +886,8 @@ static int stop_mounts(
return -EINVAL;
}
if (!path_is_safe(where)) {
log_error("Path contains unsafe components: %s", where);
if (!path_is_normalized(where)) {
log_error("Path contains non-normalized components: %s", where);
return -EINVAL;
}
@@ -1568,8 +1568,8 @@ int main(int argc, char* argv[]) {
goto finish;
}
if (!path_is_safe(arg_mount_what)) {
log_error("Path contains unsafe components: %s", arg_mount_what);
if (!path_is_normalized(arg_mount_what)) {
log_error("Path contains non-normalized components: %s", arg_mount_what);
r = -EINVAL;
goto finish;
}
@@ -1592,8 +1592,8 @@ int main(int argc, char* argv[]) {
goto finish;
}
if (!path_is_safe(arg_mount_where)) {
log_error("Path contains unsafe components: %s", arg_mount_where);
if (!path_is_normalized(arg_mount_where)) {
log_error("Path contains non-normalized components: %s", arg_mount_where);
r = -EINVAL;
goto finish;
}