diff options
Diffstat (limited to 'security/tomoyo/file.c')
-rw-r--r-- | security/tomoyo/file.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index 727cc723f87d..ae32cab8ec7e 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c | |||
@@ -24,7 +24,6 @@ static const char *tomoyo_path_keyword[TOMOYO_MAX_PATH_OPERATION] = { | |||
24 | [TOMOYO_TYPE_SYMLINK] = "symlink", | 24 | [TOMOYO_TYPE_SYMLINK] = "symlink", |
25 | [TOMOYO_TYPE_REWRITE] = "rewrite", | 25 | [TOMOYO_TYPE_REWRITE] = "rewrite", |
26 | [TOMOYO_TYPE_CHROOT] = "chroot", | 26 | [TOMOYO_TYPE_CHROOT] = "chroot", |
27 | [TOMOYO_TYPE_MOUNT] = "mount", | ||
28 | [TOMOYO_TYPE_UMOUNT] = "unmount", | 27 | [TOMOYO_TYPE_UMOUNT] = "unmount", |
29 | }; | 28 | }; |
30 | 29 | ||
@@ -108,8 +107,8 @@ bool tomoyo_compare_number_union(const unsigned long value, | |||
108 | * | 107 | * |
109 | * Returns mode. | 108 | * Returns mode. |
110 | */ | 109 | */ |
111 | static int tomoyo_init_request_info(struct tomoyo_request_info *r, | 110 | int tomoyo_init_request_info(struct tomoyo_request_info *r, |
112 | struct tomoyo_domain_info *domain) | 111 | struct tomoyo_domain_info *domain) |
113 | { | 112 | { |
114 | memset(r, 0, sizeof(*r)); | 113 | memset(r, 0, sizeof(*r)); |
115 | if (!domain) | 114 | if (!domain) |
@@ -487,7 +486,7 @@ static int tomoyo_update_file_pattern_entry(const char *pattern, | |||
487 | * | 486 | * |
488 | * Caller holds tomoyo_read_lock(). | 487 | * Caller holds tomoyo_read_lock(). |
489 | */ | 488 | */ |
490 | static const struct tomoyo_path_info * | 489 | const struct tomoyo_path_info * |
491 | tomoyo_get_file_pattern(const struct tomoyo_path_info *filename) | 490 | tomoyo_get_file_pattern(const struct tomoyo_path_info *filename) |
492 | { | 491 | { |
493 | struct tomoyo_pattern_entry *ptr; | 492 | struct tomoyo_pattern_entry *ptr; |
@@ -1418,7 +1417,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, | |||
1418 | } | 1417 | } |
1419 | 1418 | ||
1420 | /** | 1419 | /** |
1421 | * tomoyo_path_perm - Check permission for "unlink", "rmdir", "truncate", "symlink", "rewrite", "chroot", "mount" and "unmount". | 1420 | * tomoyo_path_perm - Check permission for "unlink", "rmdir", "truncate", "symlink", "rewrite", "chroot" and "unmount". |
1422 | * | 1421 | * |
1423 | * @operation: Type of operation. | 1422 | * @operation: Type of operation. |
1424 | * @path: Pointer to "struct path". | 1423 | * @path: Pointer to "struct path". |