diff options
-rw-r--r-- | security/tomoyo/domain.c | 2 | ||||
-rw-r--r-- | security/tomoyo/file.c | 4 | ||||
-rw-r--r-- | security/tomoyo/tomoyo.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index 34bb641c6743..eb75401fd6b0 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c | |||
@@ -721,7 +721,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm, | |||
721 | } | 721 | } |
722 | 722 | ||
723 | /* Check execute permission. */ | 723 | /* Check execute permission. */ |
724 | retval = tomoyo_check_exec_perm(old_domain, &r, tmp); | 724 | retval = tomoyo_check_exec_perm(old_domain, &r); |
725 | if (retval < 0) | 725 | if (retval < 0) |
726 | goto out; | 726 | goto out; |
727 | 727 | ||
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index a67f9e61ee60..ab0cd3538510 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c | |||
@@ -1012,13 +1012,11 @@ int tomoyo_check_file_perm(struct tomoyo_domain_info *domain, | |||
1012 | * | 1012 | * |
1013 | * @domain: Pointer to "struct tomoyo_domain_info". | 1013 | * @domain: Pointer to "struct tomoyo_domain_info". |
1014 | * @filename: Check permission for "execute". | 1014 | * @filename: Check permission for "execute". |
1015 | * @tmp: Buffer for temporary use. | ||
1016 | * | 1015 | * |
1017 | * Returns 0 on success, negativevalue otherwise. | 1016 | * Returns 0 on success, negativevalue otherwise. |
1018 | */ | 1017 | */ |
1019 | int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, | 1018 | int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, |
1020 | const struct tomoyo_path_info *filename, | 1019 | const struct tomoyo_path_info *filename) |
1021 | struct tomoyo_page_buffer *tmp) | ||
1022 | { | 1020 | { |
1023 | const u8 mode = tomoyo_check_flags(domain, TOMOYO_MAC_FOR_FILE); | 1021 | const u8 mode = tomoyo_check_flags(domain, TOMOYO_MAC_FOR_FILE); |
1024 | 1022 | ||
diff --git a/security/tomoyo/tomoyo.h b/security/tomoyo/tomoyo.h index f12d5ada7dcb..0fd588a629cf 100644 --- a/security/tomoyo/tomoyo.h +++ b/security/tomoyo/tomoyo.h | |||
@@ -17,13 +17,11 @@ struct path; | |||
17 | struct inode; | 17 | struct inode; |
18 | struct linux_binprm; | 18 | struct linux_binprm; |
19 | struct pt_regs; | 19 | struct pt_regs; |
20 | struct tomoyo_page_buffer; | ||
21 | 20 | ||
22 | int tomoyo_check_file_perm(struct tomoyo_domain_info *domain, | 21 | int tomoyo_check_file_perm(struct tomoyo_domain_info *domain, |
23 | const char *filename, const u8 perm); | 22 | const char *filename, const u8 perm); |
24 | int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, | 23 | int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, |
25 | const struct tomoyo_path_info *filename, | 24 | const struct tomoyo_path_info *filename); |
26 | struct tomoyo_page_buffer *buf); | ||
27 | int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, | 25 | int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, |
28 | struct path *path, const int flag); | 26 | struct path *path, const int flag); |
29 | int tomoyo_check_1path_perm(struct tomoyo_domain_info *domain, | 27 | int tomoyo_check_1path_perm(struct tomoyo_domain_info *domain, |