diff options
Diffstat (limited to 'security/tomoyo/file.c')
-rw-r--r-- | security/tomoyo/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index db342ef87af7..1b24304edb7d 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c | |||
@@ -168,7 +168,7 @@ static int tomoyo_update_globally_readable_entry(const char *filename, | |||
168 | const struct tomoyo_path_info *saved_filename; | 168 | const struct tomoyo_path_info *saved_filename; |
169 | int error = is_delete ? -ENOENT : -ENOMEM; | 169 | int error = is_delete ? -ENOENT : -ENOMEM; |
170 | 170 | ||
171 | if (!tomoyo_is_correct_path(filename, 1, 0, -1, __func__)) | 171 | if (!tomoyo_is_correct_path(filename, 1, 0, -1)) |
172 | return -EINVAL; | 172 | return -EINVAL; |
173 | saved_filename = tomoyo_get_name(filename); | 173 | saved_filename = tomoyo_get_name(filename); |
174 | if (!saved_filename) | 174 | if (!saved_filename) |
@@ -468,7 +468,7 @@ static int tomoyo_update_no_rewrite_entry(const char *pattern, | |||
468 | const struct tomoyo_path_info *saved_pattern; | 468 | const struct tomoyo_path_info *saved_pattern; |
469 | int error = is_delete ? -ENOENT : -ENOMEM; | 469 | int error = is_delete ? -ENOENT : -ENOMEM; |
470 | 470 | ||
471 | if (!tomoyo_is_correct_path(pattern, 0, 0, 0, __func__)) | 471 | if (!tomoyo_is_correct_path(pattern, 0, 0, 0)) |
472 | return -EINVAL; | 472 | return -EINVAL; |
473 | saved_pattern = tomoyo_get_name(pattern); | 473 | saved_pattern = tomoyo_get_name(pattern); |
474 | if (!saved_pattern) | 474 | if (!saved_pattern) |
@@ -814,7 +814,7 @@ static int tomoyo_update_path_acl(const u8 type, const char *filename, | |||
814 | 814 | ||
815 | if (!domain) | 815 | if (!domain) |
816 | return -EINVAL; | 816 | return -EINVAL; |
817 | if (!tomoyo_is_correct_path(filename, 0, 0, 0, __func__)) | 817 | if (!tomoyo_is_correct_path(filename, 0, 0, 0)) |
818 | return -EINVAL; | 818 | return -EINVAL; |
819 | saved_filename = tomoyo_get_name(filename); | 819 | saved_filename = tomoyo_get_name(filename); |
820 | if (!saved_filename) | 820 | if (!saved_filename) |
@@ -898,8 +898,8 @@ static int tomoyo_update_path2_acl(const u8 type, const char *filename1, | |||
898 | 898 | ||
899 | if (!domain) | 899 | if (!domain) |
900 | return -EINVAL; | 900 | return -EINVAL; |
901 | if (!tomoyo_is_correct_path(filename1, 0, 0, 0, __func__) || | 901 | if (!tomoyo_is_correct_path(filename1, 0, 0, 0) || |
902 | !tomoyo_is_correct_path(filename2, 0, 0, 0, __func__)) | 902 | !tomoyo_is_correct_path(filename2, 0, 0, 0)) |
903 | return -EINVAL; | 903 | return -EINVAL; |
904 | saved_filename1 = tomoyo_get_name(filename1); | 904 | saved_filename1 = tomoyo_get_name(filename1); |
905 | saved_filename2 = tomoyo_get_name(filename2); | 905 | saved_filename2 = tomoyo_get_name(filename2); |