diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2009-06-04 08:14:34 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-04 09:35:18 +0200 |
| commit | bcb86975dbcc24f820f1a37918d53914af29ace7 (patch) | |
| tree | 887bf8bd4d7d896a1357a21ad1df576e5f3ad3b9 | |
| parent | security: use mmap_min_addr indepedently of security models (diff) | |
| download | linux-bcb86975dbcc24f820f1a37918d53914af29ace7.tar.xz linux-bcb86975dbcc24f820f1a37918d53914af29ace7.zip | |
TOMOYO: Remove unused parameter.
TOMOYO 2.2.0 does not check argv[] and envp[] upon execve().
We don't need to pass "struct tomoyo_page_buffer".
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
| -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, } /* Check execute permission. */ - retval = tomoyo_check_exec_perm(old_domain, &r, tmp); + retval = tomoyo_check_exec_perm(old_domain, &r); if (retval < 0) goto out; 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, * * @domain: Pointer to "struct tomoyo_domain_info". * @filename: Check permission for "execute". - * @tmp: Buffer for temporary use. * * Returns 0 on success, negativevalue otherwise. */ int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, - const struct tomoyo_path_info *filename, - struct tomoyo_page_buffer *tmp) + const struct tomoyo_path_info *filename) { const u8 mode = tomoyo_check_flags(domain, TOMOYO_MAC_FOR_FILE); 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; struct inode; struct linux_binprm; struct pt_regs; -struct tomoyo_page_buffer; int tomoyo_check_file_perm(struct tomoyo_domain_info *domain, const char *filename, const u8 perm); int tomoyo_check_exec_perm(struct tomoyo_domain_info *domain, - const struct tomoyo_path_info *filename, - struct tomoyo_page_buffer *buf); + const struct tomoyo_path_info *filename); int tomoyo_check_open_permission(struct tomoyo_domain_info *domain, struct path *path, const int flag); int tomoyo_check_1path_perm(struct tomoyo_domain_info *domain, |